diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 18:38:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 18:38:13 -0700 |
| commit | 9a79b2274186fade17134929d4f85b70d59a3840 (patch) | |
| tree | d74e9ecc83ef617166445501b49087726595fb63 /block | |
| parent | 75473c1d3930896bbabcc99bb58fafd53ef42473 (diff) | |
| parent | 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (diff) | |
| download | kernel-crypto-9a79b2274186fade17134929d4f85b70d59a3840.tar.gz kernel-crypto-9a79b2274186fade17134929d4f85b70d59a3840.tar.xz kernel-crypto-9a79b2274186fade17134929d4f85b70d59a3840.zip | |
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 'block')
| -rw-r--r-- | block/bsg.c | 2 | ||||
| -rw-r--r-- | block/ll_rw_blk.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/block/bsg.c b/block/bsg.c index baa04e7adf1..f2992e72b84 100644 --- a/block/bsg.c +++ b/block/bsg.c @@ -1043,7 +1043,7 @@ static int __init bsg_init(void) dev_t devid; bsg_cmd_cachep = kmem_cache_create("bsg_cmd", - sizeof(struct bsg_command), 0, 0, NULL, NULL); + sizeof(struct bsg_command), 0, 0, NULL); if (!bsg_cmd_cachep) { printk(KERN_ERR "bsg: failed creating slab cache\n"); return -ENOMEM; diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index d7cadf30416..66056ca5e63 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c @@ -3698,13 +3698,13 @@ int __init blk_dev_init(void) panic("Failed to create kblockd\n"); request_cachep = kmem_cache_create("blkdev_requests", - sizeof(struct request), 0, SLAB_PANIC, NULL, NULL); + sizeof(struct request), 0, SLAB_PANIC, NULL); requestq_cachep = kmem_cache_create("blkdev_queue", - sizeof(request_queue_t), 0, SLAB_PANIC, NULL, NULL); + sizeof(request_queue_t), 0, SLAB_PANIC, NULL); iocontext_cachep = kmem_cache_create("blkdev_ioc", - sizeof(struct io_context), 0, SLAB_PANIC, NULL, NULL); + sizeof(struct io_context), 0, SLAB_PANIC, NULL); for_each_possible_cpu(i) INIT_LIST_HEAD(&per_cpu(blk_cpu_done, i)); |