Skip to content

Commit

Permalink
x86: kill #ifdef for exit_idle()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Hiroshi Shimamoto authored and Ingo Molnar committed Dec 12, 2008
1 parent 6c34bc2 commit 8f2466f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
5 changes: 5 additions & 0 deletions arch/x86/include/asm/idle.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@ struct notifier_block;
void idle_notifier_register(struct notifier_block *n);
void idle_notifier_unregister(struct notifier_block *n);

#ifdef CONFIG_X86_64
void enter_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);

Expand Down
6 changes: 0 additions & 6 deletions arch/x86/kernel/apic.c
Original file line number Diff line number Diff line change
Expand Up @@ -814,9 +814,7 @@ 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();
Expand Down Expand Up @@ -1682,9 +1680,7 @@ void smp_spurious_interrupt(struct pt_regs *regs)
{
u32 v;

#ifdef CONFIG_X86_64
exit_idle();
#endif
irq_enter();
/*
* Check if this really is a spurious interrupt and ACK it
Expand Down Expand Up @@ -1713,9 +1709,7 @@ void smp_error_interrupt(struct pt_regs *regs)
{
u32 v, v1;

#ifdef CONFIG_X86_64
exit_idle();
#endif
irq_enter();
/* First tickle the hardware, only then report what went on. -- REW */
v = apic_read(APIC_ESR);
Expand Down
3 changes: 1 addition & 2 deletions arch/x86/kernel/io_apic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
unsigned vector, me;

ack_APIC_irq();
#ifdef CONFIG_X86_64
exit_idle();
#endif
irq_enter();

me = smp_processor_id();
Expand Down

0 comments on commit 8f2466f

Please sign in to comment.