diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 15:25:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 15:25:04 -0700 |
| commit | f061d83a2b29f08b41c494335b7d23a432cb5a2d (patch) | |
| tree | 4b3fe2797968491f1e18e5ef52a9d08b37a2c301 /arch | |
| parent | e345fe1ada6f91bf703ca080168745ef18b2f037 (diff) | |
| parent | e17b38bf9e70d74f3739a600db75240078ac1407 (diff) | |
| download | linux-3.10-f061d83a2b29f08b41c494335b7d23a432cb5a2d.tar.gz linux-3.10-f061d83a2b29f08b41c494335b7d23a432cb5a2d.tar.bz2 linux-3.10-f061d83a2b29f08b41c494335b7d23a432cb5a2d.zip | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Fix missing kernel-doc notation
Revert "x86, timers: Check for pending timers after (device) interrupts"
sched: Update the clock of runqueue select_task_rq() selected
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/irq.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/smp.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 39120619951..74656d1d4e3 100644 --- a/arch/x86/kernel/irq.c +++ b/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/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c index d915d956e66..ec1de97600e 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 */ |