diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 20:33:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 20:33:30 -0400 |
| commit | b1dbb67911fecb290db3f566281bcd9ccc9dc6df (patch) | |
| tree | f55add06f624f7fed8a68372d8c96b583ca578fe /block | |
| parent | 492f59f526d95e73028f57bff475b4bbe3c8cb72 (diff) | |
| parent | 70f454408e68fdba2c2529ab7d6ec3c3525e59f2 (diff) | |
Merge branch 'ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
s390: remove arch specific smp_send_stop()
panic: clean up kernel/panic.c
panic, smp: provide smp_send_stop() wrapper on UP too
panic: decrease oops_in_progress only after having done the panic
generic-ipi: eliminate WARN_ON()s during oops/panic
generic-ipi: cleanups
generic-ipi: remove CSD_FLAG_WAIT
generic-ipi: remove kmalloc()
generic IPI: simplify barriers and locking
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-softirq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-softirq.c b/block/blk-softirq.c index ce0efc6b26dc..ee9c21602228 100644 --- a/block/blk-softirq.c +++ b/block/blk-softirq.c | |||
| @@ -64,7 +64,7 @@ static int raise_blk_irq(int cpu, struct request *rq) | |||
| 64 | data->info = rq; | 64 | data->info = rq; |
| 65 | data->flags = 0; | 65 | data->flags = 0; |
| 66 | 66 | ||
| 67 | __smp_call_function_single(cpu, data); | 67 | __smp_call_function_single(cpu, data, 0); |
| 68 | return 0; | 68 | return 0; |
| 69 | } | 69 | } |
| 70 | 70 | ||