aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/proc/inode.c4
-rw-r--r--kernel/posix-timers.c3
-rw-r--r--mm/shmem.c4
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)
119 proc_inode_cachep = kmem_cache_create("proc_inode_cache", 119 proc_inode_cachep = kmem_cache_create("proc_inode_cache",
120 sizeof(struct proc_inode), 120 sizeof(struct proc_inode),
121 0, (SLAB_RECLAIM_ACCOUNT| 121 0, (SLAB_RECLAIM_ACCOUNT|
122 SLAB_MEM_SPREAD), 122 SLAB_MEM_SPREAD|SLAB_PANIC),
123 init_once); 123 init_once);
124 if (proc_inode_cachep == NULL)
125 return -ENOMEM;
126 return 0; 124 return 0;
127} 125}
128 126
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)
241 register_posix_clock(CLOCK_MONOTONIC, &clock_monotonic); 241 register_posix_clock(CLOCK_MONOTONIC, &clock_monotonic);
242 242
243 posix_timers_cache = kmem_cache_create("posix_timers_cache", 243 posix_timers_cache = kmem_cache_create("posix_timers_cache",
244 sizeof (struct k_itimer), 0, 0, NULL); 244 sizeof (struct k_itimer), 0, SLAB_PANIC,
245 NULL);
245 idr_init(&posix_timers_id); 246 idr_init(&posix_timers_id);
246 return 0; 247 return 0;
247} 248}
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)
2343{ 2343{
2344 shmem_inode_cachep = kmem_cache_create("shmem_inode_cache", 2344 shmem_inode_cachep = kmem_cache_create("shmem_inode_cache",
2345 sizeof(struct shmem_inode_info), 2345 sizeof(struct shmem_inode_info),
2346 0, 0, init_once); 2346 0, SLAB_PANIC, init_once);
2347 if (shmem_inode_cachep == NULL)
2348 return -ENOMEM;
2349 return 0; 2347 return 0;
2350} 2348}
2351 2349