diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 15:28:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 15:28:42 -0700 |
| commit | 666484f0250db2e016948d63b3ef33e202e3b8d0 (patch) | |
| tree | 734f48c10aa364965e4f4642ee3de51669e62be2 /block/blk-core.c | |
| parent | d18bb9a548e550f3ced57618e75085fb3f173133 (diff) | |
| parent | ace7f1b79670aa0c1d9f4b0442be82e565827333 (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/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index dbc7f42b5d2..c6e536597c8 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; |