patch-2.3.43 linux/arch/sparc/kernel/rtrap.S

• Lines: 31
• Date: Wed Feb 9 20:08:09 2000
• Orig file: v2.3.42/linux/arch/sparc/kernel/rtrap.S
• Orig date: Tue Jan 11 22:31:38 2000

diff -u --recursive --new-file v2.3.42/linux/arch/sparc/kernel/rtrap.S linux/arch/sparc/kernel/rtrap.S
@@ -1,4 +1,4 @@
-/* $Id: rtrap.S,v 1.53 2000/01/08 16:38:18 anton Exp $
+/* $Id: rtrap.S,v 1.54 2000/02/09 11:15:03 davem Exp $
  * rtrap.S: Return from Sparc trap low-level code.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -48,16 +48,18 @@
 	.globl	rtrap_patch3, rtrap_patch4, rtrap_patch5
 	.globl	C_LABEL(ret_trap_lockless_ipi)
 ret_trap_entry:
-	sethi	%hi(C_LABEL(bh_active)), %l3
-	sethi	%hi(C_LABEL(bh_mask)), %l4
-	ld	[%l4 + %lo(C_LABEL(bh_mask))], %g5
-	ld	[%l3 + %lo(C_LABEL(bh_active))], %g4
+	ld	[%curptr + AOFF_task_processor], %l3
+	sll	%l3, 5, %l3
+	sethi	%hi(C_LABEL(softirq_state)), %l4
+	add	%l4, %l3, %l4
+	ld	[%l4 + %lo(C_LABEL(softirq_state))], %g5
+	ld	[%l4 + %lo(C_LABEL(softirq_state) + 4)], %g4
 	andcc	%g4, %g5, %g0
 	be	C_LABEL(ret_trap_lockless_ipi)
 	 nop
-	call	C_LABEL(do_bottom_half)
+	call	C_LABEL(do_softirq)
 	 nop
-
+	
 C_LABEL(ret_trap_lockless_ipi):
 	andcc	%t_psr, PSR_PS, %g0
 	be	1f