From 7f9b2f5d8fd4f77d0236c0d89858b9335b91e74b Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Fri, 13 Apr 2012 03:35:13 +0000
Subject: [PATCH] --- yaml --- r: 299183 b: refs/heads/master c:
 3d3eeb2ef26112a200785e5fca58ec58dd33bf1e h: refs/heads/master i:   299181:
 d27ffbec11255cf437e6ffda9ad932d5b6d04d87   299179:
 cd518a0e3f7c1e6bb6caa8d32e5e6e422960de7c   299175:
 004df1f779358d23149751129be6eb15c6aa4a43   299167:
 d06d8b525ec71854c658da2744696fc5d266dcb3 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/sparc/kernel/rtrap_64.S | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 1a80c7a7fdd1..ce9984e75891 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e0daff30fd7ecf698e5d20b0fa7f851e427cca5
+refs/heads/master: 3d3eeb2ef26112a200785e5fca58ec58dd33bf1e
diff --git a/trunk/arch/sparc/kernel/rtrap_64.S b/trunk/arch/sparc/kernel/rtrap_64.S
index 77f1b95e0806..9171fc238def 100644
--- a/trunk/arch/sparc/kernel/rtrap_64.S
+++ b/trunk/arch/sparc/kernel/rtrap_64.S
@@ -20,11 +20,6 @@
 
 		.text
 		.align			32
-__handle_softirq:
-		call			do_softirq
-		 nop
-		ba,a,pt			%xcc, __handle_softirq_continue
-		 nop
 __handle_preemption:
 		call			schedule
 		 wrpr			%g0, RTRAP_PSTATE, %pstate
@@ -89,9 +84,7 @@ rtrap:
 		cmp			%l1, 0
 
 		/* mm/ultra.S:xcall_report_regs KNOWS about this load. */
-		bne,pn			%icc, __handle_softirq
 		 ldx			[%sp + PTREGS_OFF + PT_V9_TSTATE], %l1
-__handle_softirq_continue:
 rtrap_xcall:
 		sethi			%hi(0xf << 20), %l4
 		and			%l1, %l4, %l4