diff --git a/[refs] b/[refs] index 9529f5f855e9..c0e0424022f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a2cba993b0a04f258ab75e15cf3f08ada268dbd +refs/heads/master: bc0055aee40ba40627361d8ffd8530d315920f18 diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c index 03cce3d3d986..77786be032e0 100644 --- a/trunk/mm/slob.c +++ b/trunk/mm/slob.c @@ -298,7 +298,8 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, c->align = (flags & SLAB_MUST_HWCACHE_ALIGN) ? SLOB_ALIGN : 0; if (c->align < align) c->align = align; - } + } else if (flags & SLAB_PANIC) + panic("Cannot create slab cache %s\n", name); return c; }