From 1f62189cfe05f7df4219688e55a432e5c87cae1f Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paul.mckenney@linaro.org>
Date: Fri, 24 Aug 2012 13:22:13 -0700
Subject: [PATCH] --- yaml --- r: 323567 b: refs/heads/master c:
 93482f4ef1093f5961a63359a34612183d6beea0 h: refs/heads/master i:   323565:
 37b8be32fcaf90abeb258443d5577e6d976cef55   323563:
 47267add13b463042e6721662bff470bdeba5a9b   323559:
 6b17245eafc9abfe7d43dc792ac83f89658efabf   323551:
 0b6670aad26542c0d3fa091cc91c64ff6ee9eff6 v: v3

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

diff --git a/[refs] b/[refs]
index 1a17ab4c8fd9..1038b6f500c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11ad47a0edbd62bfc0547cfcdf227a911433f207
+refs/heads/master: 93482f4ef1093f5961a63359a34612183d6beea0
diff --git a/trunk/arch/ia64/kernel/process.c b/trunk/arch/ia64/kernel/process.c
index dd6fc1449741..3e316ec0b835 100644
--- a/trunk/arch/ia64/kernel/process.c
+++ b/trunk/arch/ia64/kernel/process.c
@@ -29,6 +29,7 @@
 #include <linux/kdebug.h>
 #include <linux/utsname.h>
 #include <linux/tracehook.h>
+#include <linux/rcupdate.h>
 
 #include <asm/cpu.h>
 #include <asm/delay.h>
@@ -279,6 +280,7 @@ cpu_idle (void)
 
 	/* endless idle loop with no priority at all */
 	while (1) {
+		rcu_idle_enter();
 		if (can_do_pal_halt) {
 			current_thread_info()->status &= ~TS_POLLING;
 			/*
@@ -309,6 +311,7 @@ cpu_idle (void)
 			normal_xtp();
 #endif
 		}
+		rcu_idle_exit();
 		schedule_preempt_disabled();
 		check_pgt_cache();
 		if (cpu_is_offline(cpu))