aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-22 14:55:23 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-22 14:55:23 +1000
commita5b518ed314bfd25ea5e433ce09f8b27080023db (patch)
tree777d0f9202136dcff484121ad7673eb65d099567 /arch/powerpc/kernel
parente2b5530698cbe8148577b24097eaefcd835ac9ca (diff)
ppc64/powerpc: Fix time initialization on SMP systems
This moves smp_space_timers from arch/ppc64/kernel/smp.c to arch/powerpc/kernel/time.c and makes it initialize last_jiffy[] instead of paca[].next_jiffy_update_tb, since last_jiffy[] is now what the time code uses. It also declares smp_space_timers in include/asm-powerpc/time.h and gets rid of an ifdef in div128_by_32. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r--arch/powerpc/kernel/time.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 3e722370113..b635c7de669 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -458,7 +458,7 @@ void wakeup_decrementer(void)
per_cpu(last_jiffy, i) = tb_last_stamp;
}
-#ifdef CONFIG_SMPxxx
+#ifdef CONFIG_SMP
void __init smp_space_timers(unsigned int max_cpus)
{
int i;
@@ -948,16 +948,6 @@ void div128_by_32(u64 dividend_high, u64 dividend_low,
w = a / divisor;
ra = ((u64)(a - (w * divisor)) << 32) + b;
-#ifdef CONFIG_PPC64
- x = ra / divisor;
- rb = ((ra - (x * divisor)) << 32) + c;
-
- y = rb / divisor;
- rc = ((rb - (y * divisor)) << 32) + d;
-
- z = rc / divisor;
-#else
- /* for 32-bit, use do_div from div64.h */
rb = ((u64) do_div(ra, divisor) << 32) + c;
x = ra;
@@ -966,10 +956,8 @@ void div128_by_32(u64 dividend_high, u64 dividend_low,
do_div(rc, divisor);
z = rc;
-#endif
dr->result_high = ((u64)w << 32) + x;
dr->result_low = ((u64)y << 32) + z;
}
-