aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salter <msalter@redhat.com>2012-01-08 13:25:56 -0500
committerMark Salter <msalter@redhat.com>2012-01-08 15:13:16 -0500
commit166c0eaedfc3157dc1394c27e827add19f05fb27 (patch)
treefd4fa4fc8064dbe54ee18bf75da37ca18ea863ba
parent7123a6cab02ebc5dca61d0e341267578b245f2f3 (diff)
C6X: replace tick_nohz_stop/restart_sched_tick calls
The following commits replaced the tick_nohz_{stop,restart}_sched_tick API with separate tick and rcu calls: 280f06774afedf849f0b34248ed6aff57d0f6908 2bbb6817c0ac1b5f2a68d720f364f98eeb1ac4fd 1268fbc746ea1cd279886a740dcbad4ba5232225 This patch replaces the C6X use of the old API with the newer interfaces. Signed-off-by: Mark Salter <msalter@redhat.com>
-rw-r--r--arch/c6x/kernel/process.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/c6x/kernel/process.c b/arch/c6x/kernel/process.c
index aa65c879323b..7ca8c41b03cd 100644
--- a/arch/c6x/kernel/process.c
+++ b/arch/c6x/kernel/process.c
@@ -71,7 +71,8 @@ void cpu_idle(void)
71{ 71{
72 /* endless idle loop with no priority at all */ 72 /* endless idle loop with no priority at all */
73 while (1) { 73 while (1) {
74 tick_nohz_stop_sched_tick(1); 74 tick_nohz_idle_enter();
75 rcu_idle_enter();
75 while (1) { 76 while (1) {
76 local_irq_disable(); 77 local_irq_disable();
77 if (need_resched()) { 78 if (need_resched()) {
@@ -80,7 +81,8 @@ void cpu_idle(void)
80 } 81 }
81 c6x_idle(); /* enables local irqs */ 82 c6x_idle(); /* enables local irqs */
82 } 83 }
83 tick_nohz_restart_sched_tick(); 84 rcu_idle_exit();
85 tick_nohz_idle_exit();
84 86
85 preempt_enable_no_resched(); 87 preempt_enable_no_resched();
86 schedule(); 88 schedule();