[PATCH] use SLAB_PANIC for general caches

From: Brian Gerst <bgerst@didntduck.org>

Initialize the general caches using SLAB_PANIC instead of BUG().

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/mm/slab.c b/mm/slab.c
index 3d6ccd50a96bfe3f3312c176c93fdb31403fbd7e..7ac848cee87318e4c65f547e074ac00cf7a98207 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -754,11 +754,9 @@ void __init kmem_cache_init(void)
                 * eliminates "false sharing".
                 * Note for systems short on memory removing the alignment will
                 * allow tighter packing of the smaller caches. */
-               sizes->cs_cachep = kmem_cache_create(
-                       names->name, sizes->cs_size,
-                       ARCH_KMALLOC_MINALIGN, 0, NULL, NULL);
-               if (!sizes->cs_cachep)
-                       BUG();
+               sizes->cs_cachep = kmem_cache_create(names->name,
+                       sizes->cs_size, ARCH_KMALLOC_MINALIGN,
+                       SLAB_PANIC, NULL, NULL);
 
                /* Inc off-slab bufctl limit until the ceiling is hit. */
                if (!(OFF_SLAB(sizes->cs_cachep))) {
@@ -766,11 +764,9 @@ void __init kmem_cache_init(void)
                        offslab_limit /= sizeof(kmem_bufctl_t);
                }
 
-               sizes->cs_dmacachep = kmem_cache_create(
-                       names->name_dma, sizes->cs_size,
-                       ARCH_KMALLOC_MINALIGN, SLAB_CACHE_DMA, NULL, NULL);
-               if (!sizes->cs_dmacachep)
-                       BUG();
+               sizes->cs_dmacachep = kmem_cache_create(names->name_dma,
+                       sizes->cs_size, ARCH_KMALLOC_MINALIGN,
+                       (SLAB_CACHE_DMA | SLAB_PANIC), NULL, NULL);
 
                sizes++;
                names++;