diff --git a/[refs] b/[refs] index 9158b8dc7de8..da2be2b0ea4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35024c384ba4faaeac361a1ffee05a1475f9a9ed +refs/heads/master: 5e18e2b8b3d453e68accc3e295643fe4b5bbc295 diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c index cb675d126791..bf7e8fc3aed8 100644 --- a/trunk/mm/slob.c +++ b/trunk/mm/slob.c @@ -535,7 +535,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;