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

• Lines: 32
• Date: Wed Jun 21 22:30:59 2000
• Orig file: v2.4.0-test1/linux/arch/alpha/kernel/irq.c
• Orig date: Wed Apr 26 16:34:06 2000

diff -u --recursive --new-file v2.4.0-test1/linux/arch/alpha/kernel/irq.c linux/arch/alpha/kernel/irq.c
@@ -240,7 +240,7 @@
 		return;
 
 	while (((cpu_present_mask >> cpu) & 1) == 0)
-		cpu = (cpu < NR_CPUS ? cpu + 1 : 0);
+		cpu = (cpu < (NR_CPUS-1) ? cpu + 1 : 0);
 	last_cpu = cpu;
 
 	irq_affinity[irq] = 1UL << cpu;
@@ -520,8 +520,10 @@
 	p += sprintf(p, "           ");
 	for (i = 0; i < smp_num_cpus; i++)
 		p += sprintf(p, "CPU%d       ", i);
+#ifdef DO_BROADCAST_INTS
 	for (i = 0; i < smp_num_cpus; i++)
 		p += sprintf(p, "TRY%d       ", i);
+#endif
 	*p++ = '\n';
 #endif
 
@@ -536,9 +538,11 @@
 		for (j = 0; j < smp_num_cpus; j++)
 			p += sprintf(p, "%10u ",
 				     kstat.irqs[cpu_logical_map(j)][i]);
+#ifdef DO_BROADCAST_INTS
 		for (j = 0; j < smp_num_cpus; j++)
 			p += sprintf(p, "%10lu ",
 				     irq_attempt(cpu_logical_map(j), i));
+#endif
 #endif
 		p += sprintf(p, " %14s", irq_desc[i].handler->typename);
 		p += sprintf(p, "  %c%s",