patch-2.1.54 linux/arch/i386/kernel/irq.c

• Lines: 63
• Date: Sat Sep 6 10:43:49 1997
• Orig file: v2.1.53/linux/arch/i386/kernel/irq.c
• Orig date: Mon Jun 30 15:57:04 1997

diff -u --recursive --new-file v2.1.53/linux/arch/i386/kernel/irq.c linux/arch/i386/kernel/irq.c
@@ -42,8 +42,6 @@
 extern volatile unsigned long smp_local_timer_ticks[1+NR_CPUS];
 #endif
 
-#define CR0_NE 32
-
 unsigned int local_irq_count[NR_CPUS];
 #ifdef __SMP__
 atomic_t __intel_bh_counter;
@@ -55,6 +53,8 @@
 static unsigned int int_count[NR_CPUS][NR_IRQS] = {{0},};
 #endif
 
+atomic_t nmi_counter;
+
 /*
  * This contains the irq mask for both irq controllers
  */
@@ -199,7 +199,6 @@
  * be shot.
  */
  
-
 static void math_error_irq(int cpl, void *dev_id, struct pt_regs *regs)
 {
 	outb(0,0xF0);
@@ -224,28 +223,26 @@
 
 int get_irq_list(char *buf)
 {
-	int i, len = 0;
+	int i;
 	struct irqaction * action;
+	char *p = buf;
 
 	for (i = 0 ; i < NR_IRQS ; i++) {
 		action = irq_action[i];
 		if (!action) 
 			continue;
-		len += sprintf(buf+len, "%2d: %10u   %s",
+		p += sprintf(p, "%3d: %10u   %s",
 			i, kstat.interrupts[i], action->name);
 		for (action=action->next; action; action = action->next) {
-			len += sprintf(buf+len, ", %s", action->name);
+			p += sprintf(p, ", %s", action->name);
 		}
-		len += sprintf(buf+len, "\n");
+		*p++ = '\n';
 	}
-/*
- *	Linus - should you add NMI counts here ?????
- */
+	p += sprintf(p, "NMI: %10u\n", atomic_read(&nmi_counter));
 #ifdef __SMP_PROF__
-	len+=sprintf(buf+len, "IPI: %8lu received\n",
-		ipi_count);
+	p += sprintf(p, "IPI: %10lu\n", ipi_count);
 #endif		
-	return len;
+	return p - buf;
 }
 
 #ifdef __SMP_PROF__