Merge branch 'topic/kmemtrace' of git://git.kernel.org/pub/scm/linux/kernel/git/penbe...

[linux-2.6-omap-h63xx.git] / mm / slob.c

diff --git a/mm/slob.c b/mm/slob.c
index 55de44ae5d30b4292e698b994ff7ff0d349cfb65..0f1a49f40690e583d98a23bcabdfbb794e4aa3a3 100644 (file)
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -549,7 +549,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
        struct kmem_cache *c;
 
        c = slob_alloc(sizeof(struct kmem_cache),
-               flags, ARCH_KMALLOC_MINALIGN, -1);
+               GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
 
        if (c) {
                c->name = name;