aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-14 18:28:42 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-14 18:28:42 -0400
commit666484f0250db2e016948d63b3ef33e202e3b8d0 (patch)
tree734f48c10aa364965e4f4642ee3de51669e62be2 /block
parentd18bb9a548e550f3ced57618e75085fb3f173133 (diff)
parentace7f1b79670aa0c1d9f4b0442be82e565827333 (diff)
Merge branch 'core/softirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/softirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: softirq: remove irqs_disabled warning from local_bh_enable softirq: remove initialization of static per-cpu variable Remove argument from open_softirq which is always NULL
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index dbc7f42b5d2b..c6e536597c8a 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2048,7 +2048,7 @@ int __init blk_dev_init(void)
2048 for_each_possible_cpu(i) 2048 for_each_possible_cpu(i)
2049 INIT_LIST_HEAD(&per_cpu(blk_cpu_done, i)); 2049 INIT_LIST_HEAD(&per_cpu(blk_cpu_done, i));
2050 2050
2051 open_softirq(BLOCK_SOFTIRQ, blk_done_softirq, NULL); 2051 open_softirq(BLOCK_SOFTIRQ, blk_done_softirq);
2052 register_hotcpu_notifier(&blk_cpu_notifier); 2052 register_hotcpu_notifier(&blk_cpu_notifier);
2053 2053
2054 return 0; 2054 return 0;