From d52838f8b280f98544e1db7bd70fc5cf04a77dba Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 21 Mar 2013 22:49:36 +0100
Subject: [PATCH] --- yaml --- r: 366119 b: refs/heads/master c:
 fa35e42a00ec0120db2b5128753206efb288e789 h: refs/heads/master i:   366117:
 924eb200b375c43d1a323c84a11e52a38733918f   366115:
 3f0ed6d46ca552f6f2ccfc4011aa414256fb8245   366111:
 7c12818ee9cf890eeec71c17e08e1df07630a06c v: v3

---
 [refs]                          |  2 +-
 trunk/arch/arc/Kconfig          |  1 +
 trunk/arch/arc/kernel/process.c | 27 +--------------------------
 trunk/arch/arc/kernel/smp.c     |  2 +-
 4 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 26b54cfcdc14..cf035e60ab80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d166991234347215dc23fc9dc15a63a83a1a54e1
+refs/heads/master: fa35e42a00ec0120db2b5128753206efb288e789
diff --git a/trunk/arch/arc/Kconfig b/trunk/arch/arc/Kconfig
index e6f4eca09ee3..b006977a1516 100644
--- a/trunk/arch/arc/Kconfig
+++ b/trunk/arch/arc/Kconfig
@@ -14,6 +14,7 @@ config ARC
 	select GENERIC_ATOMIC64
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_FIND_FIRST_BIT
+	select GENERIC_IDLE_LOOP
 	# for now, we don't need GENERIC_IRQ_PROBE, CONFIG_GENERIC_IRQ_CHIP
 	select GENERIC_IRQ_SHOW
 	select GENERIC_KERNEL_EXECVE
diff --git a/trunk/arch/arc/kernel/process.c b/trunk/arch/arc/kernel/process.c
index 0a7531d99294..cad66851e0c4 100644
--- a/trunk/arch/arc/kernel/process.c
+++ b/trunk/arch/arc/kernel/process.c
@@ -41,37 +41,12 @@ SYSCALL_DEFINE0(arc_gettls)
 	return task_thread_info(current)->thr_ptr;
 }
 
-static inline void arch_idle(void)
+void arch_cpu_idle(void)
 {
 	/* sleep, but enable all interrupts before committing */
 	__asm__("sleep 0x3");
 }
 
-void cpu_idle(void)
-{
-	/* Since we SLEEP in idle loop, TIF_POLLING_NRFLAG can't be set */
-
-	/* endless idle loop with no priority at all */
-	while (1) {
-		tick_nohz_idle_enter();
-		rcu_idle_enter();
-
-doze:
-		local_irq_disable();
-		if (!need_resched()) {
-			arch_idle();
-			goto doze;
-		} else {
-			local_irq_enable();
-		}
-
-		rcu_idle_exit();
-		tick_nohz_idle_exit();
-
-		schedule_preempt_disabled();
-	}
-}
-
 asmlinkage void ret_from_fork(void);
 
 /* Layout of Child kernel mode stack as setup at the end of this function is
diff --git a/trunk/arch/arc/kernel/smp.c b/trunk/arch/arc/kernel/smp.c
index 3af3e06dcf02..5c7fd603d216 100644
--- a/trunk/arch/arc/kernel/smp.c
+++ b/trunk/arch/arc/kernel/smp.c
@@ -141,7 +141,7 @@ void __cpuinit start_kernel_secondary(void)
 
 	local_irq_enable();
 	preempt_disable();
-	cpu_idle();
+	cpu_startup_entry(CPUHP_ONLINE);
 }
 
 /*