patch-2.4.0-test2 linux/arch/alpha/kernel/sys_dp264.c

• Lines: 34
• Date: Wed Jun 21 22:30:59 2000
• Orig file: v2.4.0-test1/linux/arch/alpha/kernel/sys_dp264.c
• Orig date: Sun Mar 19 18:35:30 2000

diff -u --recursive --new-file v2.4.0-test1/linux/arch/alpha/kernel/sys_dp264.c linux/arch/alpha/kernel/sys_dp264.c
@@ -36,7 +36,7 @@
 /* Note mask bit is true for ENABLED irqs.  */
 static unsigned long cached_irq_mask;
 /* dp264 boards handle at max four CPUs */
-static unsigned long cpu_irq_affinity[4] = { ~0UL, ~0UL, ~0UL, ~0UL };
+static unsigned long cpu_irq_affinity[4] = { 0UL, 0UL, 0UL, 0UL };
 
 spinlock_t dp264_irq_lock = SPIN_LOCK_UNLOCKED;
 
@@ -52,6 +52,7 @@
 	volatile unsigned long *dim0, *dim1, *dim2, *dim3;
 	unsigned long mask0, mask1, mask2, mask3, dummy;
 
+	mask &= ~isa_enable;
 	mask0 = mask & cpu_irq_affinity[0];
 	mask1 = mask & cpu_irq_affinity[1];
 	mask2 = mask & cpu_irq_affinity[2];
@@ -170,7 +171,6 @@
 			aff &= ~(1UL << irq);
 		cpu_irq_affinity[cpu] = aff;
 	}
-
 }
 
 static void
@@ -275,7 +275,7 @@
 
 	irq = (vector - 0x800) >> 4;
 
-	/*
+/*
 	 * The SRM console reports PCI interrupts with a vector calculated by:
 	 *
 	 *	0x900 + (0x10 * DRIR-bit)