aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc/inode.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 21:38:13 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 21:38:13 -0400
commit9a79b2274186fade17134929d4f85b70d59a3840 (patch)
treed74e9ecc83ef617166445501b49087726595fb63 /fs/proc/inode.c
parent75473c1d3930896bbabcc99bb58fafd53ef42473 (diff)
parent20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (diff)
Merge branch 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: mm: Remove slab destructors from kmem_cache_create().
Diffstat (limited to 'fs/proc/inode.c')
-rw-r--r--fs/proc/inode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index dd28e86ab422..94e2c1adf184 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -112,14 +112,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
112 112
113 inode_init_once(&ei->vfs_inode); 113 inode_init_once(&ei->vfs_inode);
114} 114}
115 115
116int __init proc_init_inodecache(void) 116int __init proc_init_inodecache(void)
117{ 117{
118 proc_inode_cachep = kmem_cache_create("proc_inode_cache", 118 proc_inode_cachep = kmem_cache_create("proc_inode_cache",
119 sizeof(struct proc_inode), 119 sizeof(struct proc_inode),
120 0, (SLAB_RECLAIM_ACCOUNT| 120 0, (SLAB_RECLAIM_ACCOUNT|
121 SLAB_MEM_SPREAD), 121 SLAB_MEM_SPREAD),
122 init_once, NULL); 122 init_once);
123 if (proc_inode_cachep == NULL) 123 if (proc_inode_cachep == NULL)
124 return -ENOMEM; 124 return -ENOMEM;
125 return 0; 125 return 0;