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

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

diff -u --recursive --new-file v2.4.0-test5/linux/arch/alpha/kernel/entry.S linux/arch/alpha/kernel/entry.S
@@ -6,6 +6,7 @@
 
 #include <linux/config.h>
 #include <asm/system.h>
+#include <asm/cache.h>
 
 #define SIGCHLD 20
 
@@ -576,10 +577,10 @@
 ret_from_sys_call:
 	cmovne	$26,0,$19		/* $19 = 0 => non-restartable */
 	ldl	$3,TASK_PROCESSOR($8)
-	lda	$4,softirq_state
-	sll	$3,5,$3
+	lda	$4,irq_stat		/* softirq_active */
+	sll	$3,L1_CACHE_SHIFT,$3
 	addq	$3,$4,$4
-	ldq	$4,0($4)
+	ldq	$4,0($4)		/* softirq_active[32] + softirq_mask[32] */
 	sll	$4,32,$3
 	and	$4,$3,$4
 	bne	$4,handle_softirq