---

yaml --- r: 13731 b: refs/heads/master c: cbe62e2 h: refs/heads/master i: 13729: 3d8ac85 13727: ec734c6 v: v3
git-mirror · Nov 10, 2005 · 3f5dc82 · 3f5dc82
1 parent 8bb404a
commit 3f5dc82
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;