patch-2.4.0-test6 linux/arch/mips64/kernel/entry.S

Next file: linux/arch/mips64/kernel/linux32.c
Previous file: linux/arch/mips64/kernel/binfmt_elf32.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test5/linux/arch/mips64/kernel/entry.S linux/arch/mips64/kernel/entry.S
@@ -35,14 +35,14 @@
 
 FEXPORT(ret_from_sys_call)
 FEXPORT(ret_from_irq)
-		la	t1, softirq_state
+		la	t1, irq_stat		# softirq_active
 #ifdef CONFIG_SMP
 		lwu	t0, TASK_PROCESSOR($28)
 		dsll	t0, t0, 5
 		daddu	t1, t0
 #endif
-		lw	t0, 0 (t1)
-		lw	t1, 4 (t1)		# unused delay slot
+		lw	t0, 0 (t1)		# softirq_active
+		lw	t1, 4 (t1)		# softirq_mask.  unused delay slot
 		and	t0, t1
 		bnez	t0, handle_softirq
 9:		 ld	t0, PT_STATUS(sp)	# returning to kernel mode?

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)