diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 21:38:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 21:38:13 -0400 |
commit | 9a79b2274186fade17134929d4f85b70d59a3840 (patch) | |
tree | d74e9ecc83ef617166445501b49087726595fb63 /fs/openpromfs/inode.c | |
parent | 75473c1d3930896bbabcc99bb58fafd53ef42473 (diff) | |
parent | 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (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/openpromfs/inode.c')
-rw-r--r-- | fs/openpromfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c index e62397341c36..dd86be2aa6c9 100644 --- a/fs/openpromfs/inode.c +++ b/fs/openpromfs/inode.c | |||
@@ -431,7 +431,7 @@ static int __init init_openprom_fs(void) | |||
431 | 0, | 431 | 0, |
432 | (SLAB_RECLAIM_ACCOUNT | | 432 | (SLAB_RECLAIM_ACCOUNT | |
433 | SLAB_MEM_SPREAD), | 433 | SLAB_MEM_SPREAD), |
434 | op_inode_init_once, NULL); | 434 | op_inode_init_once); |
435 | if (!op_inode_cachep) | 435 | if (!op_inode_cachep) |
436 | return -ENOMEM; | 436 | return -ENOMEM; |
437 | 437 | ||