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 /ipc | |
| 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 'ipc')
| -rw-r--r-- | ipc/mqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index a242c83d89d6..145d5a0d299f 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
| @@ -1253,7 +1253,7 @@ static int __init init_mqueue_fs(void) | |||
| 1253 | 1253 | ||
| 1254 | mqueue_inode_cachep = kmem_cache_create("mqueue_inode_cache", | 1254 | mqueue_inode_cachep = kmem_cache_create("mqueue_inode_cache", |
| 1255 | sizeof(struct mqueue_inode_info), 0, | 1255 | sizeof(struct mqueue_inode_info), 0, |
| 1256 | SLAB_HWCACHE_ALIGN, init_once, NULL); | 1256 | SLAB_HWCACHE_ALIGN, init_once); |
| 1257 | if (mqueue_inode_cachep == NULL) | 1257 | if (mqueue_inode_cachep == NULL) |
| 1258 | return -ENOMEM; | 1258 | return -ENOMEM; |
| 1259 | 1259 | ||