patch-2.4.0-test6 linux/arch/arm/kernel/entry-common.S

• Lines: 40
• Date: Fri Aug 4 16:15:37 2000
• Orig file: v2.4.0-test5/linux/arch/arm/kernel/entry-common.S
• Orig date: Fri Jun 23 21:55:07 2000

diff -u --recursive --new-file v2.4.0-test5/linux/arch/arm/kernel/entry-common.S linux/arch/arm/kernel/entry-common.S
@@ -9,7 +9,7 @@
 #ifdef CONFIG_SMP
 #error SMP not supported
 #else
-		ldr	\rd, __softirq_state
+		ldr	\rd, __irq_stat
 #endif
 		.endm
 
@@ -22,7 +22,7 @@
 		add	sp, sp, #S_OFF
 ret_from_sys_call:				@ external entry
 		get_softirq r0
-		ldmia	r0, {r0, r1}
+		ldmia	r0, {r0, r1}		@ softirq_active, softirq_mask
 		mov	r4, #1			@ flag this as being syscall return
 		tst	r0, r1
 		blne	SYMBOL_NAME(do_softirq)
@@ -48,7 +48,7 @@
 		.globl	ret_from_exception
 ret_from_exception:				@ external entry
 		get_softirq r0
-		ldmia	r0, {r0, r1}
+		ldmia	r0, {r0, r1}		@ softirq_active, softirq_mask
 		mov	r4, #0
 		tst	r0, r1
 		blne	SYMBOL_NAME(do_softirq)
@@ -129,9 +129,9 @@
 		b	SYMBOL_NAME(deferred)
 
 		.align	5
-		.type	__softirq_state, #object
-__softirq_state:
-		.word	SYMBOL_NAME(softirq_state)
+		.type	__irq_stat, #object
+__irq_stat:
+		.word	SYMBOL_NAME(irq_stat)
 
 		.type	sys_call_table, #object
 ENTRY(sys_call_table)