---

yaml --- r: 299183 b: refs/heads/master c: 3d3eeb2 h: refs/heads/master i: 299181: d27ffbe 299179: cd518a0 299175: 004df1f 299167: d06d8b5 v: v3
git-mirror · Apr 13, 2012 · 7f9b2f5 · 7f9b2f5
1 parent 6b330e7
commit 7f9b2f5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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