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

• Lines: 22
• Date: Fri Aug 4 16:15:37 2000
• Orig file: v2.4.0-test5/linux/arch/ia64/kernel/entry.S
• Orig date: Thu Jul 27 17:37:59 2000

diff -u --recursive --new-file v2.4.0-test5/linux/arch/ia64/kernel/entry.S linux/arch/ia64/kernel/entry.S
@@ -506,7 +506,7 @@
 	PT_REGS_UNWIND_INFO(0)
 #ifdef CONFIG_SMP
 	adds r2=IA64_TASK_PROCESSOR_OFFSET,r13
-	movl r3=softirq_state
+	movl r3=irq_stat		// softirq_active
 	;;
 	ld4 r2=[r2]
 	;;
@@ -514,10 +514,10 @@
 	;;
 	add r3=r2,r3
 #else
-	movl r3=softirq_state
+	movl r3=irq_stat		// softirq_active
 #endif
 	;;
-	ld8 r2=[r3]		// r3 is guaranteed to be 8-byte aligned!
+	ld8 r2=[r3]		// r3 (softirq_active+softirq_mask) is guaranteed to be 8-byte aligned!
 	;;
 	shr r3=r2,32
 	;;