From 81b51310fe14ec61ec1f66f5bf67068972d0bb9c Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 21 Mar 2013 22:50:04 +0100
Subject: [PATCH] --- yaml --- r: 366147 b: refs/heads/master c:
 f4e2e9a4b26789d963000f974f2dc80230bb4674 h: refs/heads/master i:   366145:
 c701f875e6529996a3b3db342221f5db72bf14c0   366143:
 3b986dd0adab48195158050bde6ab15015ce9bbd v: v3

---
 [refs]                             |  2 +-
 trunk/arch/xtensa/Kconfig          |  1 +
 trunk/arch/xtensa/kernel/process.c | 14 ++------------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 283ce76f6e69..6ed91a495dda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d1a941731fabf27e5fb6edbebb79fe856edb4e5
+refs/heads/master: f4e2e9a4b26789d963000f974f2dc80230bb4674
diff --git a/trunk/arch/xtensa/Kconfig b/trunk/arch/xtensa/Kconfig
index b09de49dbec5..e0144ff4624d 100644
--- a/trunk/arch/xtensa/Kconfig
+++ b/trunk/arch/xtensa/Kconfig
@@ -19,6 +19,7 @@ config XTENSA
 	select CLONE_BACKWARDS
 	select IRQ_DOMAIN
 	select HAVE_OPROFILE
+	select GENERIC_IDLE_LOOP
 	help
 	  Xtensa processors are 32-bit RISC machines designed by Tensilica
 	  primarily for embedded systems.  These processors are both
diff --git a/trunk/arch/xtensa/kernel/process.c b/trunk/arch/xtensa/kernel/process.c
index 5cd82e9f601c..1c85323f01d7 100644
--- a/trunk/arch/xtensa/kernel/process.c
+++ b/trunk/arch/xtensa/kernel/process.c
@@ -105,19 +105,9 @@ void coprocessor_flush_all(struct thread_info *ti)
 /*
  * Powermanagement idle function, if any is provided by the platform.
  */
-
-void cpu_idle(void)
+void arch_cpu_idle(void)
 {
-	local_irq_enable();
-
-	/* endless idle loop with no priority at all */
-	while (1) {
-		rcu_idle_enter();
-		while (!need_resched())
-			platform_idle();
-		rcu_idle_exit();
-		schedule_preempt_disabled();
-	}
+	platform_idle();
 }
 
 /*