From 47267add13b463042e6721662bff470bdeba5a9b 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: 323563 b: refs/heads/master c:
 5b0753a90b7a98bc613c3767e9263a1a76d4f900 h: refs/heads/master i:   323561:
 b65b58c0a59fb8cad25de4f7e18570de70a55076   323559:
 6b17245eafc9abfe7d43dc792ac83f89658efabf v: v3

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

diff --git a/[refs] b/[refs]
index 0c0511fc64ac..ba54464c1762 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b57ba37e82a15f345a6a2eb8c01a2b2d94c5eeb
+refs/heads/master: 5b0753a90b7a98bc613c3767e9263a1a76d4f900
diff --git a/trunk/arch/mn10300/kernel/process.c b/trunk/arch/mn10300/kernel/process.c
index 7dab0cd36466..e9cceba193b6 100644
--- a/trunk/arch/mn10300/kernel/process.c
+++ b/trunk/arch/mn10300/kernel/process.c
@@ -25,6 +25,7 @@
 #include <linux/err.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
+#include <linux/rcupdate.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/io.h>
@@ -107,6 +108,7 @@ void cpu_idle(void)
 {
 	/* endless idle loop with no priority at all */
 	for (;;) {
+		rcu_idle_enter();
 		while (!need_resched()) {
 			void (*idle)(void);
 
@@ -121,6 +123,7 @@ void cpu_idle(void)
 			}
 			idle();
 		}
+		rcu_idle_exit();
 
 		schedule_preempt_disabled();
 	}