From 0e2b31e177681cd6ebfba0d9176f562704e02698 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Sat, 11 Feb 2006 23:22:47 -0800
Subject: [PATCH] --- yaml --- r: 21420 b: refs/heads/master c:
 02fead75055246d01af56a45a9d1b311d506da3e h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/sparc64/kernel/smp.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8134c959c285..40657dd81771 100644
--- 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
index d637168ce37d..2dbe008d6b7a 100644
--- 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;