1 files changed, 5 insertions, 1 deletions

diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index d637168ce37d..2dbe008d6b7a 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/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;