From 7b9c3c3b8afd974e63666448d4f7ee52ed1d6913 Mon Sep 17 00:00:00 2001
From: Mark Salter <msalter@redhat.com>
Date: Sun, 8 Jan 2012 13:25:56 -0500
Subject: [PATCH] --- yaml --- r: 283196 b: refs/heads/master c:
 166c0eaedfc3157dc1394c27e827add19f05fb27 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/c6x/kernel/process.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 533270d89d2a..fe48dd2f4a00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7123a6cab02ebc5dca61d0e341267578b245f2f3
+refs/heads/master: 166c0eaedfc3157dc1394c27e827add19f05fb27
diff --git a/trunk/arch/c6x/kernel/process.c b/trunk/arch/c6x/kernel/process.c
index aa65c879323b..7ca8c41b03cd 100644
--- a/trunk/arch/c6x/kernel/process.c
+++ b/trunk/arch/c6x/kernel/process.c
@@ -71,7 +71,8 @@ void cpu_idle(void)
 {
 	/* endless idle loop with no priority at all */
 	while (1) {
-		tick_nohz_stop_sched_tick(1);
+		tick_nohz_idle_enter();
+		rcu_idle_enter();
 		while (1) {
 			local_irq_disable();
 			if (need_resched()) {
@@ -80,7 +81,8 @@ void cpu_idle(void)
 			}
 			c6x_idle(); /* enables local irqs */
 		}
-		tick_nohz_restart_sched_tick();
+		rcu_idle_exit();
+		tick_nohz_idle_exit();
 
 		preempt_enable_no_resched();
 		schedule();