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/hugetlbfs/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/hugetlbfs/inode.c')
| -rw-r--r-- | fs/hugetlbfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index d145cb79c30a..c848a191525d 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
| @@ -848,7 +848,7 @@ static int __init init_hugetlbfs_fs(void) | |||
| 848 | 848 | ||
| 849 | hugetlbfs_inode_cachep = kmem_cache_create("hugetlbfs_inode_cache", | 849 | hugetlbfs_inode_cachep = kmem_cache_create("hugetlbfs_inode_cache", |
| 850 | sizeof(struct hugetlbfs_inode_info), | 850 | sizeof(struct hugetlbfs_inode_info), |
| 851 | 0, 0, init_once, NULL); | 851 | 0, 0, init_once); |
| 852 | if (hugetlbfs_inode_cachep == NULL) | 852 | if (hugetlbfs_inode_cachep == NULL) |
| 853 | return -ENOMEM; | 853 | return -ENOMEM; |
| 854 | 854 | ||