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

Next file: linux/arch/i386/kernel/i386_ksyms.c
Previous file: linux/arch/i386/kernel/apm.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test5/linux/arch/i386/kernel/entry.S linux/arch/i386/kernel/entry.S
@@ -130,8 +130,8 @@
 .previous
 
 #define GET_CURRENT(reg) \
-	movl %esp, reg; \
-	andl $-8192, reg;
+	movl $-8192, reg; \
+	andl %esp, reg
 
 ENTRY(lcall7)
 	pushfl			# We get a different stack layout with call gates,
@@ -206,11 +206,11 @@
 #ifdef CONFIG_SMP
 	movl processor(%ebx),%eax
 	shll $5,%eax
-	movl SYMBOL_NAME(softirq_state)(,%eax),%ecx
-	testl SYMBOL_NAME(softirq_state)+4(,%eax),%ecx
+	movl SYMBOL_NAME(irq_stat)(,%eax),%ecx		# softirq_active
+	testl SYMBOL_NAME(irq_stat)+4(,%eax),%ecx	# softirq_mask
 #else
-	movl SYMBOL_NAME(softirq_state),%ecx
-	testl SYMBOL_NAME(softirq_state)+4,%ecx
+	movl SYMBOL_NAME(irq_stat),%ecx		# softirq_active
+	testl SYMBOL_NAME(irq_stat)+4,%ecx	# softirq_mask
 #endif
 	jne   handle_softirq
 	
@@ -262,11 +262,11 @@
 	GET_CURRENT(%ebx)
 	movl processor(%ebx),%eax
 	shll $5,%eax
-	movl SYMBOL_NAME(softirq_state)(,%eax),%ecx
-	testl SYMBOL_NAME(softirq_state)+4(,%eax),%ecx
+	movl SYMBOL_NAME(irq_stat)(,%eax),%ecx		# softirq_active
+	testl SYMBOL_NAME(irq_stat)+4(,%eax),%ecx	# softirq_mask
 #else
-	movl SYMBOL_NAME(softirq_state),%ecx
-	testl SYMBOL_NAME(softirq_state)+4,%ecx
+	movl SYMBOL_NAME(irq_stat),%ecx		# softirq_active
+	testl SYMBOL_NAME(irq_stat)+4,%ecx	# softirq_mask
 #endif
 	jne   handle_softirq
 

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