patch-2.4.0-test6 linux/arch/sparc/kernel/rtrap.S

• Lines: 20
• Date: Sun Aug 6 11:43:17 2000
• Orig file: v2.4.0-test5/linux/arch/sparc/kernel/rtrap.S
• Orig date: Thu Feb 10 17:11:05 2000

diff -u --recursive --new-file v2.4.0-test5/linux/arch/sparc/kernel/rtrap.S linux/arch/sparc/kernel/rtrap.S
@@ -1,4 +1,4 @@
-/* $Id: rtrap.S,v 1.54 2000/02/09 11:15:03 davem Exp $
+/* $Id: rtrap.S,v 1.55 2000/08/05 10:48:40 davem Exp $
  * rtrap.S: Return from Sparc trap low-level code.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -50,10 +50,10 @@
 ret_trap_entry:
 	ld	[%curptr + AOFF_task_processor], %l3
 	sll	%l3, 5, %l3
-	sethi	%hi(C_LABEL(softirq_state)), %l4
+	sethi	%hi(C_LABEL(irq_stat)), %l4		! &softirq_active
 	add	%l4, %l3, %l4
-	ld	[%l4 + %lo(C_LABEL(softirq_state))], %g5
-	ld	[%l4 + %lo(C_LABEL(softirq_state) + 4)], %g4
+	ld	[%l4 + %lo(C_LABEL(irq_stat))], %g5	! softirq_active
+	ld	[%l4 + %lo(C_LABEL(irq_stat) + 4)], %g4	! softirq_mask
 	andcc	%g4, %g5, %g0
 	be	C_LABEL(ret_trap_lockless_ipi)
 	 nop