patch-1.3.50 linux/arch/alpha/kernel/irq.c

Next file: linux/arch/alpha/kernel/lca.c
Previous file: linux/arch/alpha/kernel/head.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.49/linux/arch/alpha/kernel/irq.c linux/arch/alpha/kernel/irq.c
@@ -356,6 +356,14 @@
 #	define IACK_SC	APECS_IACK_SC
 #elif defined(CONFIG_ALPHA_LCA)
 #	define IACK_SC	LCA_IACK_SC
+#else
+    	/*
+	 * This is bogus but necessary to get it to compile
+	 * on all platforms.  If you try to use this on any
+	 * other than the intended platforms, you'll notice
+	 * real fast...
+	 */
+#	define IACK_SC	1L
 #endif
 	int j;
 
@@ -568,7 +576,7 @@
 	irqmask |= ((((unsigned long)cache_26)<<16) |
 		    (((unsigned long)cache_27)<<24));
 #endif
-	irqs &= irqmask;
+	irqs &= irqmask & ~1;	/* always mask out irq 0---it's the unused timer */
 	if (!irqs)
 		return 0;
 	i = ffz(~irqs);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this