sparc64: Remove trap return code which is now unnecessary.

Noticed by Linus.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 11 deletions

diff --git a/arch/sparc/kernel/rtrap_64.S b/arch/sparc/kernel/rtrap_64.S
index 9171fc238def..afa2a9e3d0a0 100644
--- a/arch/sparc/kernel/rtrap_64.S
+++ b/arch/sparc/kernel/rtrap_64.S
@@ -73,18 +73,8 @@ rtrap_nmi:	ldx			[%sp + PTREGS_OFF + PT_V9_TSTATE], %l1
                 .globl                  rtrap_irq, rtrap, irqsz_patchme, rtrap_xcall
 rtrap_irq:
 rtrap:
-#ifndef CONFIG_SMP
-                sethi                   %hi(__cpu_data), %l0
-                lduw                    [%l0 + %lo(__cpu_data)], %l1
-#else
-                sethi                   %hi(__cpu_data), %l0
-                or                      %l0, %lo(__cpu_data), %l0
-                lduw                    [%l0 + %g5], %l1
-#endif
-                cmp                     %l1, 0
-
                 /* mm/ultra.S:xcall_report_regs KNOWS about this load. */
-                 ldx                    [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1
+                ldx                     [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1
 rtrap_xcall:
                 sethi                   %hi(0xf << 20), %l4
                 and                     %l1, %l4, %l4