patch-2.4.21 linux-2.4.21/arch/m68k/kernel/entry.S

Next file: linux-2.4.21/arch/m68k/kernel/head.S
Previous file: linux-2.4.21/arch/m68k/ifpsp060/iskeleton.S
Back to the patch index
Back to the overall index

diff -urN linux-2.4.20/arch/m68k/kernel/entry.S linux-2.4.21/arch/m68k/kernel/entry.S
@@ -240,13 +240,10 @@
 2:
 	RESTORE_ALL
 1:
-#if 1
-	bfextu  %sp@(PT_SR){#5,#3},%d0	| Check for nested interrupt.
-#if MAX_NOINT_IPL > 0
-	cmpiw	#MAX_NOINT_IPL,%d0
-#endif
-	jhi	2b
-#endif
+	moveq	#(~ALLOWINT>>8)&0xff,%d0
+	andb	%sp@(PT_SR),%d0
+	jne	2b
+
 	/* check if we need to do software interrupts */
 	tstl	SYMBOL_NAME(irq_stat)	| softirq_pending ?
 	jeq	SYMBOL_NAME(ret_from_exception)

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