aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-17 23:47:18 -0500
committerPaul Mackerras <paulus@samba.org>2005-11-17 23:47:18 -0500
commit6146eed1e972a7de93ce2e36adc5812de81e879c (patch)
treeecc17eeb0034a87c8f9bd763f258d4f6e2ff914d /arch
parent437a58db57c61385baaa1cb8b7fa590b6a2f1607 (diff)
powerpc: Fix compile error on pSeries arising from delay.h changes
pseries_dedicated_idle() was using __get_tb which used to be defined in asm/delay.h. Change it to use get_tb from asm/time.h, which is in fact exactly the same thing. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/pseries/setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index b9d9732b2e06..4a465f067ede 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -504,7 +504,7 @@ static void pseries_dedicated_idle(void)
504 lpaca->lppaca.idle = 1; 504 lpaca->lppaca.idle = 1;
505 505
506 if (!need_resched()) { 506 if (!need_resched()) {
507 start_snooze = __get_tb() + 507 start_snooze = get_tb() +
508 *smt_snooze_delay * tb_ticks_per_usec; 508 *smt_snooze_delay * tb_ticks_per_usec;
509 509
510 while (!need_resched() && !cpu_is_offline(cpu)) { 510 while (!need_resched() && !cpu_is_offline(cpu)) {
@@ -518,7 +518,7 @@ static void pseries_dedicated_idle(void)
518 HMT_very_low(); 518 HMT_very_low();
519 519
520 if (*smt_snooze_delay != 0 && 520 if (*smt_snooze_delay != 0 &&
521 __get_tb() > start_snooze) { 521 get_tb() > start_snooze) {
522 HMT_medium(); 522 HMT_medium();
523 dedicated_idle_sleep(cpu); 523 dedicated_idle_sleep(cpu);
524 } 524 }