All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Len Brown <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org,
	len.brown@intel.com, peterz@infradead.org, mingo@kernel.org
Subject: [tip:x86/idle] x86/idle: Remove enter_idle(), exit_idle()
Date: Fri, 18 Nov 2016 03:21:28 -0800	[thread overview]
Message-ID: <tip-7a3e686e1bb57c34f73d3f19d620fe29035a6c99@git.kernel.org> (raw)
In-Reply-To: <822f2c22cc5890f7b8ea0eeec60277eb44505b4e.1479449716.git.len.brown@intel.com>

Commit-ID:  7a3e686e1bb57c34f73d3f19d620fe29035a6c99
Gitweb:     http://git.kernel.org/tip/7a3e686e1bb57c34f73d3f19d620fe29035a6c99
Author:     Len Brown <len.brown@intel.com>
AuthorDate: Fri, 18 Nov 2016 01:23:21 -0500
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Fri, 18 Nov 2016 12:07:57 +0100

x86/idle: Remove enter_idle(), exit_idle()

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>

---
 arch/x86/include/asm/apic.h      |  1 -
 arch/x86/include/asm/idle.h      |  9 ---------
 arch/x86/kernel/kvm.c            |  2 --
 arch/x86/kernel/process.c        | 25 -------------------------
 drivers/xen/events/events_base.c |  1 -
 5 files changed, 38 deletions(-)

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index f5aaf6c..5731274 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -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)
diff --git a/arch/x86/include/asm/idle.h b/arch/x86/include/asm/idle.h
index 02bab09..dcebb1c 100644
--- a/arch/x86/include/asm/idle.h
+++ b/arch/x86/include/asm/idle.h
@@ -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 */
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index edbbfc8..093f550 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -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;
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index d8e9d79..ee023919 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -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)
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index 9ecfcdc..9ad622a 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -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
 

  reply	other threads:[~2016-11-18 11:22 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-18  6:23 [PATCH 0/5] x86: remove idle notifier Len Brown
2016-11-18  6:23 ` [PATCH 1/5] i7300_idle: remove this driver Len Brown
2016-11-18  6:23   ` [PATCH 2/5] x86: remove idle_notifier Len Brown
2016-11-18 11:19     ` [tip:x86/idle] x86/idle: Remove idle_notifier tip-bot for Len Brown
2016-12-06 16:54     ` [PATCH 2/5] x86: remove idle_notifier Pavel Machek
2016-12-07 11:46       ` Thomas Gleixner
2016-12-07 13:40         ` Pavel Machek
2016-12-08  9:18           ` Thomas Gleixner
2016-12-08 22:05             ` Pavel Machek
2016-12-08 22:53               ` Thomas Gleixner
2016-11-18  6:23   ` [PATCH 3/5] x86: remove is_idle flag Len Brown
2016-11-18 11:20     ` [tip:x86/idle] x86/idle: Remove " tip-bot for Len Brown
2016-11-18  6:23   ` [PATCH 4/5] x86: remove x86_test_and_clear_bit_percpu() Len Brown
2016-11-18 11:20     ` [tip:x86/idle] x86: Remove x86_test_and_clear_bit_percpu() tip-bot for Len Brown
2016-11-18  6:23   ` [PATCH 5/5] x86: remove enter_idle(), exit_idle() Len Brown
2016-11-18 11:21     ` tip-bot for Len Brown [this message]
2016-11-18 11:19   ` [tip:x86/idle] i7300_idle: Remove this driver tip-bot for Len Brown
2016-11-18  8:17 ` [PATCH 0/5] x86: remove idle notifier Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-7a3e686e1bb57c34f73d3f19d620fe29035a6c99@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=hpa@zytor.com \
    --cc=len.brown@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.