summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/smp.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-10-15 08:07:26 +0200
committerIngo Molnar <mingo@elte.hu>2009-10-15 08:07:30 +0200
commita0738a688d1105cbf8d71868a1e020c6cdf42d4c (patch)
tree2cad553a9def773ce79b8fc793f89c0634187109 /arch/x86/kernel/smp.c
parentx86, perf_event: Rename 'performance counter interrupt' (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff)
downloadlinux-a0738a688d1105cbf8d71868a1e020c6cdf42d4c.tar.xz
linux-a0738a688d1105cbf8d71868a1e020c6cdf42d4c.zip
Merge branch 'linus' into x86/urgent
Merge reason: pull in latest, to be able to revert a patch there. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smp.c')
-rw-r--r--arch/x86/kernel/smp.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
index d915d956e66d..ec1de97600e7 100644
--- a/arch/x86/kernel/smp.c
+++ b/arch/x86/kernel/smp.c
@@ -198,7 +198,6 @@ void smp_reschedule_interrupt(struct pt_regs *regs)
{
ack_APIC_irq();
inc_irq_stat(irq_resched_count);
- run_local_timers();
/*
* KVM uses this interrupt to force a cpu out of guest mode
*/