diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/idle.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c index 39a2baa6ad58..878572f70ac5 100644 --- a/arch/powerpc/kernel/idle.c +++ b/arch/powerpc/kernel/idle.c | |||
@@ -56,7 +56,7 @@ void cpu_idle(void) | |||
56 | 56 | ||
57 | set_thread_flag(TIF_POLLING_NRFLAG); | 57 | set_thread_flag(TIF_POLLING_NRFLAG); |
58 | while (1) { | 58 | while (1) { |
59 | tick_nohz_stop_sched_tick(1); | 59 | tick_nohz_idle_enter(); |
60 | while (!need_resched() && !cpu_should_die()) { | 60 | while (!need_resched() && !cpu_should_die()) { |
61 | ppc64_runlatch_off(); | 61 | ppc64_runlatch_off(); |
62 | 62 | ||
@@ -93,7 +93,7 @@ void cpu_idle(void) | |||
93 | 93 | ||
94 | HMT_medium(); | 94 | HMT_medium(); |
95 | ppc64_runlatch_on(); | 95 | ppc64_runlatch_on(); |
96 | tick_nohz_restart_sched_tick(); | 96 | tick_nohz_idle_exit(); |
97 | preempt_enable_no_resched(); | 97 | preempt_enable_no_resched(); |
98 | if (cpu_should_die()) | 98 | if (cpu_should_die()) |
99 | cpu_die(); | 99 | cpu_die(); |
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index ea0acbd8966d..e83dfaf89f69 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c | |||
@@ -563,7 +563,7 @@ static void yield_shared_processor(void) | |||
563 | static void iseries_shared_idle(void) | 563 | static void iseries_shared_idle(void) |
564 | { | 564 | { |
565 | while (1) { | 565 | while (1) { |
566 | tick_nohz_stop_sched_tick(1); | 566 | tick_nohz_idle_enter(); |
567 | while (!need_resched() && !hvlpevent_is_pending()) { | 567 | while (!need_resched() && !hvlpevent_is_pending()) { |
568 | local_irq_disable(); | 568 | local_irq_disable(); |
569 | ppc64_runlatch_off(); | 569 | ppc64_runlatch_off(); |
@@ -577,7 +577,7 @@ static void iseries_shared_idle(void) | |||
577 | } | 577 | } |
578 | 578 | ||
579 | ppc64_runlatch_on(); | 579 | ppc64_runlatch_on(); |
580 | tick_nohz_restart_sched_tick(); | 580 | tick_nohz_idle_exit(); |
581 | 581 | ||
582 | if (hvlpevent_is_pending()) | 582 | if (hvlpevent_is_pending()) |
583 | process_iSeries_events(); | 583 | process_iSeries_events(); |
@@ -593,7 +593,7 @@ static void iseries_dedicated_idle(void) | |||
593 | set_thread_flag(TIF_POLLING_NRFLAG); | 593 | set_thread_flag(TIF_POLLING_NRFLAG); |
594 | 594 | ||
595 | while (1) { | 595 | while (1) { |
596 | tick_nohz_stop_sched_tick(1); | 596 | tick_nohz_idle_enter(); |
597 | if (!need_resched()) { | 597 | if (!need_resched()) { |
598 | while (!need_resched()) { | 598 | while (!need_resched()) { |
599 | ppc64_runlatch_off(); | 599 | ppc64_runlatch_off(); |
@@ -610,7 +610,7 @@ static void iseries_dedicated_idle(void) | |||
610 | } | 610 | } |
611 | 611 | ||
612 | ppc64_runlatch_on(); | 612 | ppc64_runlatch_on(); |
613 | tick_nohz_restart_sched_tick(); | 613 | tick_nohz_idle_exit(); |
614 | preempt_enable_no_resched(); | 614 | preempt_enable_no_resched(); |
615 | schedule(); | 615 | schedule(); |
616 | preempt_disable(); | 616 | preempt_disable(); |