diff options
Diffstat (limited to 'arch/powerpc/platforms/pseries/setup.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 6710761bf60f..a6d19e3a505e 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -496,13 +496,14 @@ static int __init pSeries_probe(void) | |||
496 | } | 496 | } |
497 | 497 | ||
498 | 498 | ||
499 | DECLARE_PER_CPU(unsigned long, smt_snooze_delay); | 499 | DECLARE_PER_CPU(long, smt_snooze_delay); |
500 | 500 | ||
501 | static void pseries_dedicated_idle_sleep(void) | 501 | static void pseries_dedicated_idle_sleep(void) |
502 | { | 502 | { |
503 | unsigned int cpu = smp_processor_id(); | 503 | unsigned int cpu = smp_processor_id(); |
504 | unsigned long start_snooze; | 504 | unsigned long start_snooze; |
505 | unsigned long in_purr, out_purr; | 505 | unsigned long in_purr, out_purr; |
506 | long snooze = __get_cpu_var(smt_snooze_delay); | ||
506 | 507 | ||
507 | /* | 508 | /* |
508 | * Indicate to the HV that we are idle. Now would be | 509 | * Indicate to the HV that we are idle. Now would be |
@@ -517,13 +518,12 @@ static void pseries_dedicated_idle_sleep(void) | |||
517 | * has been checked recently. If we should poll for a little | 518 | * has been checked recently. If we should poll for a little |
518 | * while, do so. | 519 | * while, do so. |
519 | */ | 520 | */ |
520 | if (__get_cpu_var(smt_snooze_delay)) { | 521 | if (snooze) { |
521 | start_snooze = get_tb() + | 522 | start_snooze = get_tb() + snooze * tb_ticks_per_usec; |
522 | __get_cpu_var(smt_snooze_delay) * tb_ticks_per_usec; | ||
523 | local_irq_enable(); | 523 | local_irq_enable(); |
524 | set_thread_flag(TIF_POLLING_NRFLAG); | 524 | set_thread_flag(TIF_POLLING_NRFLAG); |
525 | 525 | ||
526 | while (get_tb() < start_snooze) { | 526 | while ((snooze < 0) || (get_tb() < start_snooze)) { |
527 | if (need_resched() || cpu_is_offline(cpu)) | 527 | if (need_resched() || cpu_is_offline(cpu)) |
528 | goto out; | 528 | goto out; |
529 | ppc64_runlatch_off(); | 529 | ppc64_runlatch_off(); |