From 179b0d03ebdba250292b171e66858140c0fc3d34 Mon Sep 17 00:00:00 2001
From: Daniel Hellstrom <daniel@gaisler.com>
Date: Thu, 9 Jun 2011 02:54:09 +0000
Subject: [PATCH] --- yaml --- r: 253372 b: refs/heads/master c:
 10f0d07c51516bd24b040016c6d4304eef05f115 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/arch/sparc/kernel/leon_kernel.c | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ed6c1ef9f511..bde81a9b35ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7d82a0a3cd547494294baee7f9764ea44bead73
+refs/heads/master: 10f0d07c51516bd24b040016c6d4304eef05f115
diff --git a/trunk/arch/sparc/kernel/leon_kernel.c b/trunk/arch/sparc/kernel/leon_kernel.c
index c23d61e9e52c..d17255a2bbac 100644
--- a/trunk/arch/sparc/kernel/leon_kernel.c
+++ b/trunk/arch/sparc/kernel/leon_kernel.c
@@ -376,6 +376,22 @@ void __init leon_init_timers(irq_handler_t counter_fn)
 		prom_halt();
 	}
 
+#ifdef CONFIG_SMP
+	{
+		unsigned long flags;
+
+		/*
+		 * In SMP, sun4m adds a IPI handler to IRQ trap handler that
+		 * LEON never must take, sun4d and LEON overwrites the branch
+		 * with a NOP.
+		 */
+		local_irq_save(flags);
+		patchme_maybe_smp_msg[0] = 0x01000000; /* NOP out the branch */
+		local_flush_cache_all();
+		local_irq_restore(flags);
+	}
+#endif
+
 	LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx].ctrl,
 			      LEON3_GPTIMER_EN |
 			      LEON3_GPTIMER_RL |