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 /block/bsg.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 'block/bsg.c')
-rw-r--r-- | block/bsg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/bsg.c b/block/bsg.c index baa04e7adf19..f2992e72b841 100644 --- a/block/bsg.c +++ b/block/bsg.c | |||
@@ -1043,7 +1043,7 @@ static int __init bsg_init(void) | |||
1043 | dev_t devid; | 1043 | dev_t devid; |
1044 | 1044 | ||
1045 | bsg_cmd_cachep = kmem_cache_create("bsg_cmd", | 1045 | bsg_cmd_cachep = kmem_cache_create("bsg_cmd", |
1046 | sizeof(struct bsg_command), 0, 0, NULL, NULL); | 1046 | sizeof(struct bsg_command), 0, 0, NULL); |
1047 | if (!bsg_cmd_cachep) { | 1047 | if (!bsg_cmd_cachep) { |
1048 | printk(KERN_ERR "bsg: failed creating slab cache\n"); | 1048 | printk(KERN_ERR "bsg: failed creating slab cache\n"); |
1049 | return -ENOMEM; | 1049 | return -ENOMEM; |