From 3f5dc82422cb3f53d71906ca26f127ad58209009 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Thu, 10 Nov 2005 14:28:03 +1100 Subject: [PATCH] --- yaml --- r: 13731 b: refs/heads/master c: cbe62e2b4a764aa3f9a2b9c9004f8e86a1f0ade8 h: refs/heads/master i: 13729: 3d8ac85557138e801076344103c54fbbcbbe3525 13727: ec734c6c033b05dba2b2f684b481e628e4c8d469 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/time.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8625f6223983..a5d8bea414c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 094fe2e712f38f49bf79ef93306c61b1b993b07b +refs/heads/master: cbe62e2b4a764aa3f9a2b9c9004f8e86a1f0ade8 diff --git a/trunk/arch/powerpc/kernel/time.c b/trunk/arch/powerpc/kernel/time.c index 386006b3d616..260b6ecd26a9 100644 --- a/trunk/arch/powerpc/kernel/time.c +++ b/trunk/arch/powerpc/kernel/time.c @@ -484,6 +484,8 @@ void __init smp_space_timers(unsigned int max_cpus) unsigned long offset = tb_ticks_per_jiffy / max_cpus; unsigned long previous_tb = per_cpu(last_jiffy, boot_cpuid); + /* make sure tb > per_cpu(last_jiffy, cpu) for all cpus always */ + previous_tb -= tb_ticks_per_jiffy; for_each_cpu(i) { if (i != boot_cpuid) { previous_tb += offset;