patch-2.3.42 linux/arch/m68k/amiga/amiints.c

• Lines: 21
• Date: Mon Jan 31 10:32:53 2000
• Orig file: v2.3.41/linux/arch/m68k/amiga/amiints.c
• Orig date: Tue Sep 7 12:14:06 1999

diff -u --recursive --new-file v2.3.41/linux/arch/m68k/amiga/amiints.c linux/arch/m68k/amiga/amiints.c
@@ -364,7 +364,7 @@
 	intena = ami_intena_vals[irq];
 	custom.intreq = intena;
 
-	/* serve first fast handlers - there can only be one of these */
+	/* serve fast handler if present - there can only be one of these */
 	node = ami_irq_list[irq];
 
 	/*
@@ -392,7 +392,11 @@
 	 */
 	custom.intena = intena;
 	save_flags(flags);
+#if 0 /* def CPU_M68060_ONLY */
 	sti();
+#else
+	restore_flags((flags & ~0x0700) | (fp->sr & 0x0700));
+#endif
 
 	slow_nodes = node;
 	for (;;) {