summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2009-06-17 08:30:54 +0300
committerPekka Enberg <penberg@cs.helsinki.fi>2009-06-17 08:30:54 +0300
commit5caf5c7dc2d303b770e426f7e2238df882f1773b (patch)
tree1dddb1941da34326e8e8becef10761d2d5d7fcc9 /mm
parente03ab9d415c47e1ff485b646f95604d3e3a91708 (diff)
parent964cf35c88f93b4927dbc4e950dfa4d880c7f9d1 (diff)
downloadlinux-5caf5c7dc2d303b770e426f7e2238df882f1773b.tar.bz2
Merge branch 'slub/earlyboot' into for-linus
Conflicts: mm/slub.c
Diffstat (limited to 'mm')
-rw-r--r--mm/slub.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/mm/slub.c b/mm/slub.c
index b2b0c78ae35d..4c6449310a0e 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2704,6 +2704,7 @@ static noinline struct kmem_cache *dma_kmalloc_cache(int index, gfp_t flags)
struct kmem_cache *s;
char *text;
size_t realsize;
+ unsigned long slabflags;
s = kmalloc_caches_dma[index];
if (s)
@@ -2725,10 +2726,18 @@ static noinline struct kmem_cache *dma_kmalloc_cache(int index, gfp_t flags)
(unsigned int)realsize);
s = kmalloc(kmem_size, flags & ~SLUB_DMA);
+ /*
+ * Must defer sysfs creation to a workqueue because we don't know
+ * what context we are called from. Before sysfs comes up, we don't
+ * need to do anything because our sysfs initcall will start by
+ * adding all existing slabs to sysfs.
+ */
+ slabflags = SLAB_CACHE_DMA|SLAB_NOTRACK;
+ if (slab_state >= SYSFS)
+ slabflags |= __SYSFS_ADD_DEFERRED;
+
if (!s || !text || !kmem_cache_open(s, flags, text,
- realsize, ARCH_KMALLOC_MINALIGN,
- SLAB_CACHE_DMA|SLAB_NOTRACK|__SYSFS_ADD_DEFERRED,
- NULL)) {
+ realsize, ARCH_KMALLOC_MINALIGN, slabflags, NULL)) {
kfree(s);
kfree(text);
goto unlock_out;
@@ -2737,7 +2746,8 @@ static noinline struct kmem_cache *dma_kmalloc_cache(int index, gfp_t flags)
list_add(&s->list, &slab_caches);
kmalloc_caches_dma[index] = s;
- schedule_work(&sysfs_add_work);
+ if (slab_state >= SYSFS)
+ schedule_work(&sysfs_add_work);
unlock_out:
up_write(&slub_lock);