---

yaml --- r: 21420 b: refs/heads/master c: 02fead7 h: refs/heads/master v: v3
git-mirror · Mar 20, 2006 · 0e2b31e · 0e2b31e
1 parent dceaffa
commit 0e2b31e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7aa6264543f19ceea9b5f386242917296d63be05
+refs/heads/master: 02fead75055246d01af56a45a9d1b311d506da3e
diff --git a/trunk/arch/sparc64/kernel/smp.c b/trunk/arch/sparc64/kernel/smp.c
@@ -1278,7 +1278,11 @@ int __devinit __cpu_up(unsigned int cpu)
 		if (!cpu_isset(cpu, cpu_online_map)) {
 			ret = -ENODEV;
 		} else {
-			smp_synchronize_one_tick(cpu);
+			/* On SUN4V, writes to %tick and %stick are
+			 * not allowed.
+			 */
+			if (tlb_type != hypervisor)
+				smp_synchronize_one_tick(cpu);
 		}
 	}
 	return ret;