Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=040b5c6f9503f2d6b35c335f8537bb3035d35547
Commit:     040b5c6f9503f2d6b35c335f8537bb3035d35547
Parent:     c4f3b63fe15b4629aa1ec163c95ab30423d0f76a
Author:     Alexey Dobriyan <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 16 23:26:10 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 08:42:47 2007 -0700

    SLAB_PANIC more (proc, posix-timers, shmem)
    
    These aren't modular, so SLAB_PANIC is OK.
    
    Signed-off-by: Alexey Dobriyan <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 fs/proc/inode.c       |    4 +---
 kernel/posix-timers.c |    3 ++-
 mm/shmem.c            |    4 +---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 7cffa43..99ca004 100644
--- 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;
 }
 
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 57efe04..d71ed09 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -241,7 +241,8 @@ static __init int init_posix_timers(void)
        register_posix_clock(CLOCK_MONOTONIC, &clock_monotonic);
 
        posix_timers_cache = kmem_cache_create("posix_timers_cache",
-                                       sizeof (struct k_itimer), 0, 0, NULL);
+                                       sizeof (struct k_itimer), 0, SLAB_PANIC,
+                                       NULL);
        idr_init(&posix_timers_id);
        return 0;
 }
diff --git a/mm/shmem.c b/mm/shmem.c
index 2048657..6fa20a8 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2343,9 +2343,7 @@ static int init_inodecache(void)
 {
        shmem_inode_cachep = kmem_cache_create("shmem_inode_cache",
                                sizeof(struct shmem_inode_info),
-                               0, 0, init_once);
-       if (shmem_inode_cachep == NULL)
-               return -ENOMEM;
+                               0, SLAB_PANIC, init_once);
        return 0;
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to