---

yaml
---
r: 366127
b: refs/heads/master
c: ccf8e78
h: refs/heads/master
i:
  366125: 3153b02
  366123: 68158ad
  366119: d52838f
  366111: 7c12818
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8dc7c5ecd8d0f739728d844ee794c4fae169f9c2
+refs/heads/master: ccf8e78fe2a7e92b6d43de8023786b9dd199aab1

trunk/arch/frv/Kconfig

@@ -8,6 +8,7 @@ config FRV
 	select HAVE_GENERIC_HARDIRQS
 	select VIRT_TO_BUS
 	select GENERIC_IRQ_SHOW
+	select GENERIC_IDLE_LOOP
 	select HAVE_DEBUG_BUGVERBOSE
 	select ARCH_HAVE_NMI_SAFE_CMPXCHG
 	select GENERIC_CPU_DEVICES

trunk/arch/frv/kernel/process.c

@@ -59,29 +59,12 @@ static void core_sleep_idle(void)
 	mb();
 }
 
-void (*idle)(void) = core_sleep_idle;
-
-/*
- * 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 cpu_idle(void)
+void arch_cpu_idle(void)
 {
-	/* endless idle loop with no priority at all */
-	while (1) {
-		rcu_idle_enter();
-		while (!need_resched()) {
-			check_pgt_cache();
-
-			if (!frv_dma_inprogress && idle)
-				idle();
-		}
-		rcu_idle_exit();
-
-		schedule_preempt_disabled();
-	}
+	if (!frv_dma_inprogress)
+		core_sleep_idle();
+	else
+		local_irq_enable();
 }
 
 void machine_restart(char * __unused)