Patches for 2.1.81p1

Steven N. Hirsch (shirsch@ibm.net)
Thu, 22 Jan 1998 18:59:17 -0500 (EST)


All,

These patches seem to be necessary for 2.1.81-pre1 to build and run on
Alpha.

Enjoy!

Steve

--- linux/arch/alpha/kernel/irq.c.orig Wed Jan 21 20:31:11 1998
+++ linux/arch/alpha/kernel/irq.c Thu Jan 22 18:13:29 1998
@@ -373,7 +373,7 @@
if (!action)
continue;
len += sprintf(buf+len, "%2d: %10u %c %s",
- i, kstat.interrupts[i],
+ i, kstat.irqs[i],
(action->flags & SA_INTERRUPT) ? '+' : ' ',
action->name);
for (action=action->next; action; action = action->next) {
@@ -567,7 +567,7 @@
int cpu = smp_processor_id();

irq_enter(cpu, irq);
- kstat.interrupts[cpu][irq]++;
+ kstat.irqs[cpu][irq]++;
if (!action) {
unexpected_irq(irq, regs);
} else {
@@ -590,7 +590,7 @@
}

irq_enter(cpu, irq);
- kstat.interrupts[cpu][irq]++;
+ kstat.irqs[cpu][irq]++;
action = irq_action[irq];
/*
* For normal interrupts, we mask it out, and then ACK it.
--- linux/include/linux/kernel_stat.h.orig Thu Jan 22 07:23:11 1998
+++ linux/include/linux/kernel_stat.h Thu Jan 22 18:25:52 1998
@@ -42,9 +42,12 @@
{
int i, sum=0;

+#ifdef __SMP__
for (i = 0 ; i < smp_num_cpus ; i++)
sum += kstat.irqs[cpu_logical_map(i)][irq];
-
+#else
+ sum += kstat.irqs[0][irq];
+#endif
return sum;
}