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

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)
         for_each_possible_cpu(i)
                 INIT_LIST_HEAD(&per_cpu(blk_cpu_done, i));
 
-        open_softirq(BLOCK_SOFTIRQ, blk_done_softirq, NULL);
+        open_softirq(BLOCK_SOFTIRQ, blk_done_softirq);
         register_hotcpu_notifier(&blk_cpu_notifier);
 
         return 0;