diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-04 00:33:30 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-04 00:33:30 (GMT) |
commit | b1dbb67911fecb290db3f566281bcd9ccc9dc6df (patch) | |
tree | f55add06f624f7fed8a68372d8c96b583ca578fe /kernel/sched.c | |
parent | 492f59f526d95e73028f57bff475b4bbe3c8cb72 (diff) | |
parent | 70f454408e68fdba2c2529ab7d6ec3c3525e59f2 (diff) | |
download | linux-fsl-qoriq-b1dbb67911fecb290db3f566281bcd9ccc9dc6df.tar.xz |
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 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 73513f4..2325db2 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -1110,7 +1110,7 @@ static void hrtick_start(struct rq *rq, u64 delay) if (rq == this_rq()) { hrtimer_restart(timer); } else if (!rq->hrtick_csd_pending) { - __smp_call_function_single(cpu_of(rq), &rq->hrtick_csd); + __smp_call_function_single(cpu_of(rq), &rq->hrtick_csd, 0); rq->hrtick_csd_pending = 1; } } |