From b65b58c0a59fb8cad25de4f7e18570de70a55076 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: 323561 b: refs/heads/master c:
 48ae077cfce72591b8fc80e1dcc87806f86fed7f h: refs/heads/master i:   323559:
 6b17245eafc9abfe7d43dc792ac83f89658efabf v: v3

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

diff --git a/[refs] b/[refs]
index d5b331d241fd..0790a290730d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2fe1430d4115c74d007c825cb9dc3317f28bb16
+refs/heads/master: 48ae077cfce72591b8fc80e1dcc87806f86fed7f
diff --git a/trunk/arch/m32r/kernel/process.c b/trunk/arch/m32r/kernel/process.c
index 3a4a32b27208..384e63f3a4c4 100644
--- a/trunk/arch/m32r/kernel/process.c
+++ b/trunk/arch/m32r/kernel/process.c
@@ -26,6 +26,7 @@
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/hardirq.h>
+#include <linux/rcupdate.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -82,6 +83,7 @@ void cpu_idle (void)
 {
 	/* endless idle loop with no priority at all */
 	while (1) {
+		rcu_idle_enter();
 		while (!need_resched()) {
 			void (*idle)(void) = pm_idle;
 
@@ -90,6 +92,7 @@ void cpu_idle (void)
 
 			idle();
 		}
+		rcu_idle_exit();
 		schedule_preempt_disabled();
 	}
 }