UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: kill #ifdef for exit_idle() 

Impact: cleanup

Introduce helper inline function in arch/x86/include/asm/idle.h
to remove #ifdefs around exit_idle().

Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Hiroshi Shimamoto 2008-12-08 19:19:07 -08:00 committed by Ingo Molnar
parent 6c34bc2976
commit 8f2466f45f
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/include/asm/idle.h
View File

@ -8,8 +8,13 @@ struct notifier_block;
void idle_notifier_register(struct notifier_block *n); void idle_notifier_register(struct notifier_block *n);
void idle_notifier_unregister(struct notifier_block *n); void idle_notifier_unregister(struct notifier_block *n);
#ifdef CONFIG_X86_64
void enter_idle(void); void enter_idle(void);
void exit_idle(void); void exit_idle(void);
#else /* !CONFIG_X86_64 */
static inline void enter_idle(void) { }
static inline void exit_idle(void) { }
#endif /* CONFIG_X86_64 */
void c1e_remove_cpu(int cpu); void c1e_remove_cpu(int cpu);

6
arch/x86/kernel/apic.c
View File

@ -814,9 +814,7 @@ void smp_apic_timer_interrupt(struct pt_regs *regs)
* Besides, if we don't timer interrupts ignore the global * Besides, if we don't timer interrupts ignore the global
* interrupt lock, which is the WrongThing (tm) to do. * interrupt lock, which is the WrongThing (tm) to do.
*/ */
#ifdef CONFIG_X86_64
exit_idle(); exit_idle();
#endif
irq_enter(); irq_enter();
local_apic_timer_interrupt(); local_apic_timer_interrupt();
irq_exit(); irq_exit();
@ -1682,9 +1680,7 @@ void smp_spurious_interrupt(struct pt_regs *regs)
{ {
u32 v; u32 v;
#ifdef CONFIG_X86_64
exit_idle(); exit_idle();
#endif
irq_enter(); irq_enter();
/* /*
* Check if this really is a spurious interrupt and ACK it * Check if this really is a spurious interrupt and ACK it
@ -1713,9 +1709,7 @@ void smp_error_interrupt(struct pt_regs *regs)
{ {
u32 v, v1; u32 v, v1;
#ifdef CONFIG_X86_64
exit_idle(); exit_idle();
#endif
irq_enter(); irq_enter();
/* First tickle the hardware, only then report what went on. -- REW */ /* First tickle the hardware, only then report what went on. -- REW */
v = apic_read(APIC_ESR); v = apic_read(APIC_ESR);

3
arch/x86/kernel/io_apic.c
View File

@ -2216,10 +2216,9 @@ static void set_ir_ioapic_affinity_irq(unsigned int irq, cpumask_t mask)
asmlinkage void smp_irq_move_cleanup_interrupt(void) asmlinkage void smp_irq_move_cleanup_interrupt(void)
{ {
unsigned vector, me; unsigned vector, me;
ack_APIC_irq(); ack_APIC_irq();
#ifdef CONFIG_X86_64
exit_idle(); exit_idle();
#endif
irq_enter(); irq_enter();
me = smp_processor_id(); me = smp_processor_id();