From 75d6265ada9c24fce5ce7ddaec76e82adfd4e2fe Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 21 Mar 2013 22:49:58 +0100
Subject: [PATCH] --- yaml --- r: 366141 b: refs/heads/master c:
 99444202b924e916aad95073d23f9995ae8eb558 h: refs/heads/master i:   366139:
 dae6f55f561c08fe7a3c3d80b88a6f5df6b1d8bf v: v3

---
 [refs]                            |  2 +-
 trunk/arch/score/Kconfig          |  1 +
 trunk/arch/score/kernel/process.c | 18 ------------------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 8e48e9c35aa2..383c3b5acfc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52c0065947b7f78a3d9808b421006a3d870d1f92
+refs/heads/master: 99444202b924e916aad95073d23f9995ae8eb558
diff --git a/trunk/arch/score/Kconfig b/trunk/arch/score/Kconfig
index c8def8bc9020..eaac45de65be 100644
--- a/trunk/arch/score/Kconfig
+++ b/trunk/arch/score/Kconfig
@@ -11,6 +11,7 @@ config SCORE
        select ARCH_DISCARD_MEMBLOCK
        select GENERIC_CPU_DEVICES
        select GENERIC_CLOCKEVENTS
+       select GENERIC_IDLE_LOOP
        select HAVE_MOD_ARCH_SPECIFIC
 	select VIRT_TO_BUS
 	select MODULES_USE_ELF_REL
diff --git a/trunk/arch/score/kernel/process.c b/trunk/arch/score/kernel/process.c
index 79568466b578..f4c6d02421d3 100644
--- a/trunk/arch/score/kernel/process.c
+++ b/trunk/arch/score/kernel/process.c
@@ -41,24 +41,6 @@ void machine_halt(void) {}
 /* If or when software machine-power-off is implemented, add code here. */
 void machine_power_off(void) {}
 
-/*
- * The idle thread. There's no useful work to be
- * done, so just try to conserve power and have a
- * low exit latency (ie sit in a loop waiting for
- * somebody to say that they'd like to reschedule)
- */
-void __noreturn cpu_idle(void)
-{
-	/* endless idle loop with no priority at all */
-	while (1) {
-		rcu_idle_enter();
-		while (!need_resched())
-			barrier();
-		rcu_idle_exit();
-		schedule_preempt_disabled();
-	}
-}
-
 void ret_from_fork(void);
 void ret_from_kernel_thread(void);