summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
authorAdrian Cox <adrian@humboldt.co.uk>2006-11-17 14:35:48 +0000
committerPaul Mackerras <paulus@samba.org>2006-12-04 20:39:35 +1100
commit9a06c3b176976919e223844f8ed9f1acae20b433 (patch)
treea211fa3933f47fee664b0f908de35f2b7245bf30 /arch/powerpc/kernel
parent35af89eb491a0741005e474626053266e6e635b7 (diff)
[POWERPC] Fix wraparound problem in smp-tbsync on 32-bit
The patch below fixes an arithmetic wrap-around issue on 32bit machines using smp-tbsync. Without this patch a timebase value over 0x000000007fffffff will hang the boot process while bringing up secondary CPUs. Signed-off-by: Adrian Cox <adrian@humboldt.co.uk> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r--arch/powerpc/kernel/smp-tbsync.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/smp-tbsync.c b/arch/powerpc/kernel/smp-tbsync.c
index de59c6c31a5..e1970f83f14 100644
--- a/arch/powerpc/kernel/smp-tbsync.c
+++ b/arch/powerpc/kernel/smp-tbsync.c
@@ -78,7 +78,7 @@ static int __devinit start_contest(int cmd, long offset, int num)
{
int i, score=0;
u64 tb;
- long mark;
+ u64 mark;
tbsync->cmd = cmd;