Skip to content

Commit

Permalink
x86/idle: Remove enter_idle(), exit_idle()
Browse files Browse the repository at this point in the history
Upon removal of the is_idle flag, these routines became NOPs.

Signed-off-by: Len Brown <len.brown@intel.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: http://lkml.kernel.org/r/822f2c22cc5890f7b8ea0eeec60277eb44505b4e.1479449716.git.len.brown@intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Len Brown authored and Thomas Gleixner committed Nov 18, 2016
1 parent 9694be7 commit 7a3e686
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 38 deletions.
1 change: 0 additions & 1 deletion arch/x86/include/asm/apic.h
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,6 @@ extern void irq_exit(void);
static inline void entering_irq(void)
{
irq_enter();
exit_idle();
}

static inline void entering_ack_irq(void)
Expand Down
9 changes: 0 additions & 9 deletions arch/x86/include/asm/idle.h
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
#ifndef _ASM_X86_IDLE_H
#define _ASM_X86_IDLE_H

#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) { }
static inline void __exit_idle(void) { }
#endif /* CONFIG_X86_64 */

void amd_e400_remove_cpu(int cpu);

#endif /* _ASM_X86_IDLE_H */
2 changes: 0 additions & 2 deletions arch/x86/kernel/kvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,13 +267,11 @@ do_async_page_fault(struct pt_regs *regs, unsigned long error_code)
case KVM_PV_REASON_PAGE_NOT_PRESENT:
/* page is swapped out by the host. */
prev_state = exception_enter();
exit_idle();
kvm_async_pf_task_wait((u32)read_cr2());
exception_exit(prev_state);
break;
case KVM_PV_REASON_PAGE_READY:
rcu_irq_enter();
exit_idle();
kvm_async_pf_task_wake((u32)read_cr2());
rcu_irq_exit();
break;
Expand Down
25 changes: 0 additions & 25 deletions arch/x86/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -234,34 +234,9 @@ static inline void play_dead(void)
}
#endif

#ifdef CONFIG_X86_64
void enter_idle(void)
{
}

static void __exit_idle(void)
{
}

/* Called from interrupts to signify idle end */
void exit_idle(void)
{
/* idle loop has pid 0 */
if (current->pid)
return;
__exit_idle();
}
#endif

void arch_cpu_idle_enter(void)
{
local_touch_nmi();
enter_idle();
}

void arch_cpu_idle_exit(void)
{
__exit_idle();
}

void arch_cpu_idle_dead(void)
Expand Down
1 change: 0 additions & 1 deletion drivers/xen/events/events_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -1256,7 +1256,6 @@ void xen_evtchn_do_upcall(struct pt_regs *regs)

irq_enter();
#ifdef CONFIG_X86
exit_idle();
inc_irq_stat(irq_hv_callback_count);
#endif

Expand Down

0 comments on commit 7a3e686

Please sign in to comment.