aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 18:38:13 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 18:38:13 -0700
commit9a79b2274186fade17134929d4f85b70d59a3840 (patch)
treed74e9ecc83ef617166445501b49087726595fb63 /drivers/message
parent75473c1d3930896bbabcc99bb58fafd53ef42473 (diff)
parent20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (diff)
downloadkernel_samsung_tuna-9a79b2274186fade17134929d4f85b70d59a3840.zip
kernel_samsung_tuna-9a79b2274186fade17134929d4f85b70d59a3840.tar.gz
kernel_samsung_tuna-9a79b2274186fade17134929d4f85b70d59a3840.tar.bz2
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 'drivers/message')
-rw-r--r--drivers/message/i2o/i2o_block.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 64a52bd..988c8ce 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -1171,8 +1171,7 @@ static int __init i2o_block_init(void)
/* Allocate request mempool and slab */
size = sizeof(struct i2o_block_request);
i2o_blk_req_pool.slab = kmem_cache_create("i2o_block_req", size, 0,
- SLAB_HWCACHE_ALIGN, NULL,
- NULL);
+ SLAB_HWCACHE_ALIGN, NULL);
if (!i2o_blk_req_pool.slab) {
osm_err("can't init request slab\n");
rc = -ENOMEM;