diff options
| author | Alexey Dobriyan <adobriyan@sw.ru> | 2007-10-16 23:26:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 08:42:47 -0700 |
| commit | 040b5c6f9503f2d6b35c335f8537bb3035d35547 (patch) | |
| tree | 71f1693fbcaf9e2a953e66fdf13bbbc20510b60e | |
| parent | c4f3b63fe15b4629aa1ec163c95ab30423d0f76a (diff) | |
| download | blackbird-op-linux-040b5c6f9503f2d6b35c335f8537bb3035d35547.tar.gz blackbird-op-linux-040b5c6f9503f2d6b35c335f8537bb3035d35547.zip | |
SLAB_PANIC more (proc, posix-timers, shmem)
These aren't modular, so SLAB_PANIC is OK.
Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/proc/inode.c | 4 | ||||
| -rw-r--r-- | kernel/posix-timers.c | 3 | ||||
| -rw-r--r-- | mm/shmem.c | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 7cffa433a3c8..99ca00485fc3 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 57efe0400bc2..d71ed09fe1dd 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 204865750fe4..6fa20a84daa0 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; } |
