diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-03 10:52:53 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-03 10:52:53 +1100 |
| commit | e769f4a4c7d473e1bf1122737d72610ba5637669 (patch) | |
| tree | 62d1fed6ea0aff3e0ed398ca9e0f8306b4ba90e0 /block | |
| parent | 57a46720211b0b96c9c2d585e3d6cdcc2d7c40b0 (diff) | |
| parent | f1797d4384f2adabbdf7b7c13c93584f08733f09 (diff) | |
Merge commit 'tip-core/auto-core-next'
Conflicts:
include/linux/netfilter/xt_limit.h
include/linux/netfilter/xt_statistic.h
lib/Kconfig.debug
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) data->info = rq; data->flags = 0; - __smp_call_function_single(cpu, data); + __smp_call_function_single(cpu, data, 0); return 0; } |