From af18d325e0461cd61ae40643be65deadebbc9c36 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: 323557 b: refs/heads/master c:
 4c94cada48f7c660eca582be6032427a5e367117 h: refs/heads/master i:   323555:
 febe79756162628b35df81559f7edf3dcc661d42 v: v3

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

diff --git a/[refs] b/[refs]
index 7adf5c9f74b9..b1caf36859de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a6c0272f17cc80a8286d915f2ddf31557c2d559
+refs/heads/master: 4c94cada48f7c660eca582be6032427a5e367117
diff --git a/trunk/arch/alpha/kernel/process.c b/trunk/arch/alpha/kernel/process.c
index db56f31dbf70..83638aa096d5 100644
--- a/trunk/arch/alpha/kernel/process.c
+++ b/trunk/arch/alpha/kernel/process.c
@@ -28,6 +28,7 @@
 #include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/slab.h>
+#include <linux/rcupdate.h>
 
 #include <asm/reg.h>
 #include <asm/uaccess.h>
@@ -54,9 +55,11 @@ cpu_idle(void)
 		/* FIXME -- EV6 and LCA45 know how to power down
 		   the CPU.  */
 
+		rcu_idle_enter();
 		while (!need_resched())
 			cpu_relax();
 
+		rcu_idle_exit();
 		schedule_preempt_disabled();
 	}
 }