Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville...

[linux-2.6] / fs / proc / inode.c

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 7cffa433a3c8ab35945b431c29c6b7cc1dd10727..99ca00485fc307ff52014dc303b60fd918f87de4 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -119,10 +119,8 @@ int __init proc_init_inodecache(void)
        proc_inode_cachep = kmem_cache_create("proc_inode_cache",
                                             sizeof(struct proc_inode),
                                             0, (SLAB_RECLAIM_ACCOUNT|
-                                               SLAB_MEM_SPREAD),
+                                               SLAB_MEM_SPREAD|SLAB_PANIC),
                                             init_once);
-       if (proc_inode_cachep == NULL)
-               return -ENOMEM;
        return 0;
 }