From 477769b851a7d84671fd5dbe09cce6a78c5cbb54 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 25 May 2012 21:20:10 +0000
Subject: [PATCH] --- yaml --- r: 309527 b: refs/heads/master c:
 b08b5c9c9b35c938e8a94d9232e05a7f69a1dba5 h: refs/heads/master i:   309525:
 34fb1b4b975452a32f396ba96bb1a222556eebc9   309523:
 cf7e856bc2a1054f488d09ea29bedd209c69fd2b   309519:
 9ac25dce9aa979090c441b50725d37a3b4ed4394 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/sparc/kernel/irq_32.c | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 75f7908d18be..af0cf94da08c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b8b93c4ab17a250a35e6db1cce094bf599a21c6
+refs/heads/master: b08b5c9c9b35c938e8a94d9232e05a7f69a1dba5
diff --git a/trunk/arch/sparc/kernel/irq_32.c b/trunk/arch/sparc/kernel/irq_32.c
index ae04914f7774..c145f6fd123b 100644
--- a/trunk/arch/sparc/kernel/irq_32.c
+++ b/trunk/arch/sparc/kernel/irq_32.c
@@ -241,9 +241,6 @@ int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler)
 	unsigned int cpu_irq;
 	int err;
 
-#if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON
-	struct tt_entry *trap_table;
-#endif
 
 	err = request_irq(irq, irq_handler, 0, "floppy", NULL);
 	if (err)
@@ -264,13 +261,18 @@ int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler)
 	table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_four = SPARC_NOP;
 
 	INSTANTIATE(sparc_ttable)
-#if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON
-	trap_table = &trapbase_cpu1;
-	INSTANTIATE(trap_table)
-	trap_table = &trapbase_cpu2;
-	INSTANTIATE(trap_table)
-	trap_table = &trapbase_cpu3;
-	INSTANTIATE(trap_table)
+
+#if defined CONFIG_SMP
+	if (sparc_cpu_model != sparc_leon) {
+		struct tt_entry *trap_table;
+
+		trap_table = &trapbase_cpu1;
+		INSTANTIATE(trap_table)
+		trap_table = &trapbase_cpu2;
+		INSTANTIATE(trap_table)
+		trap_table = &trapbase_cpu3;
+		INSTANTIATE(trap_table)
+	}
 #endif
 #undef INSTANTIATE
 	/*