summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/rtrap_64.S
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-04-13 13:56:46 -0700
committerDavid S. Miller <davem@davemloft.net>2012-04-13 13:56:46 -0700
commit78b7e3d02da71796a6060208e4a1a606e40ae197 (patch)
tree30d025d0a41a8ee95138d7c844a7ccfd1327479a /arch/sparc/kernel/rtrap_64.S
parent3423166fdbc2444bf3a4a27af1d7508364a17be7 (diff)
downloadop-kernel-dev-78b7e3d02da71796a6060208e4a1a606e40ae197.zip
op-kernel-dev-78b7e3d02da71796a6060208e4a1a606e40ae197.tar.gz
sparc64: Remove trap return code which is now unnecessary.
Noticed by Linus. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/rtrap_64.S')
-rw-r--r--arch/sparc/kernel/rtrap_64.S12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/sparc/kernel/rtrap_64.S b/arch/sparc/kernel/rtrap_64.S
index 9171fc2..afa2a9e 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
OpenPOWER on IntegriCloud