diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-10 16:16:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-10 16:16:54 +0200 |
| commit | 8123b2a238cd68820bc44ca417e2f184da575c54 (patch) | |
| tree | 11e15b308393d5fa41b87b6f54cabf8a2ba397c2 /block | |
| parent | 83b2f4ffdbedace5daf2f1dbd63eb2a9c5ea4c37 (diff) | |
| parent | 962cf36c5bf6d2840b8d66ee9a606fae2f540bbd (diff) | |
Merge branch 'core/softirq' into auto-core-next
Diffstat (limited to 'block')
| -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 1905aaba49fb..af094ff48357 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2045,7 +2045,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; |