From 83e80eb7865dd3079b7700a8bcd1461567697efb Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 9 Oct 2009 15:58:20 +0200 Subject: [PATCH] --- yaml --- r: 167453 b: refs/heads/master c: e7ab0f7b50bc4688fb5cf65de5d42e3b882fb8d1 h: refs/heads/master i: 167451: a04f5a7cf9d538ce8dec7c8081652cdeedf9f781 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/irq.c | 2 -- trunk/arch/x86/kernel/smp.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index df260ddabcf6..7ebdacb757f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5dc37530ba8a35aae0f7f4f13781d1904f71e94 +refs/heads/master: e7ab0f7b50bc4688fb5cf65de5d42e3b882fb8d1 diff --git a/trunk/arch/x86/kernel/irq.c b/trunk/arch/x86/kernel/irq.c index 391206199515..74656d1d4e30 100644 --- a/trunk/arch/x86/kernel/irq.c +++ b/trunk/arch/x86/kernel/irq.c @@ -244,7 +244,6 @@ unsigned int __irq_entry do_IRQ(struct pt_regs *regs) __func__, smp_processor_id(), vector, irq); } - run_local_timers(); irq_exit(); set_irq_regs(old_regs); @@ -269,7 +268,6 @@ void smp_generic_interrupt(struct pt_regs *regs) if (generic_interrupt_extension) generic_interrupt_extension(); - run_local_timers(); irq_exit(); set_irq_regs(old_regs); diff --git a/trunk/arch/x86/kernel/smp.c b/trunk/arch/x86/kernel/smp.c index d915d956e66d..ec1de97600e7 100644 --- a/trunk/arch/x86/kernel/smp.c +++ b/trunk/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 */