From 6b17245eafc9abfe7d43dc792ac83f89658efabf Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Wed, 22 Aug 2012 17:27:34 +0200
Subject: [PATCH] --- yaml --- r: 323559 b: refs/heads/master c:
 41d8fe5bb3cf91ce2716ac8f43e4b40d802a99c8 h: refs/heads/master i:   323557:
 af18d325e0461cd61ae40643be65deadebbc9c36   323555:
 febe79756162628b35df81559f7edf3dcc661d42   323551:
 0b6670aad26542c0d3fa091cc91c64ff6ee9eff6 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/frv/kernel/process.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e0666d57faed..3bd175a41834 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c633f9e788928e91ad11f44df29b47bbbe9550b0
+refs/heads/master: 41d8fe5bb3cf91ce2716ac8f43e4b40d802a99c8
diff --git a/trunk/arch/frv/kernel/process.c b/trunk/arch/frv/kernel/process.c
index ff95f50efea5..2eb7fa5bf9d8 100644
--- a/trunk/arch/frv/kernel/process.c
+++ b/trunk/arch/frv/kernel/process.c
@@ -25,6 +25,7 @@
 #include <linux/reboot.h>
 #include <linux/interrupt.h>
 #include <linux/pagemap.h>
+#include <linux/rcupdate.h>
 
 #include <asm/asm-offsets.h>
 #include <asm/uaccess.h>
@@ -69,12 +70,14 @@ void 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();
 	}