diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-08-24 02:01:45 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 16:53:01 +0200 |
| commit | 6460bc73aac970135104a0bc407c2c8b85394d59 (patch) | |
| tree | 82ac232268fadaae95db8681d89dbbfc0109d51d | |
| parent | 457cc52d4670bcf1470606a108bbf35aac28eb7f (diff) | |
| download | op-kernel-dev-6460bc73aac970135104a0bc407c2c8b85394d59.zip op-kernel-dev-6460bc73aac970135104a0bc407c2c8b85394d59.tar.gz | |
x86: apic - unify smp_apic_timer_interrupt
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/apic_32.c | 3 | ||||
| -rw-r--r-- | arch/x86/kernel/apic_64.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 4ca3717..913d992 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c @@ -718,6 +718,9 @@ void smp_apic_timer_interrupt(struct pt_regs *regs) * Besides, if we don't timer interrupts ignore the global * interrupt lock, which is the WrongThing (tm) to do. */ +#ifdef CONFIG_X86_64 + exit_idle(); +#endif irq_enter(); local_apic_timer_interrupt(); irq_exit(); diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 283968d..2e10911 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c @@ -625,7 +625,9 @@ void smp_apic_timer_interrupt(struct pt_regs *regs) * Besides, if we don't timer interrupts ignore the global * interrupt lock, which is the WrongThing (tm) to do. */ +#ifdef CONFIG_X86_64 exit_idle(); +#endif irq_enter(); local_apic_timer_interrupt(); irq_exit(); |
