Commit 062f344a authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds

[PATCH] m68knommu fix kstat_cpu usage int ints.c

This fixes the use kstat_cpu in m68knommu arch ints.c Replcae obsolete
use of kstat.irqs.
parent 8967788d
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
* This table stores the address info for each vector handler. * This table stores the address info for each vector handler.
*/ */
irq_handler_t irq_list[SYS_IRQS]; irq_handler_t irq_list[SYS_IRQS];
unsigned int *mach_kstat_irqs;
#define NUM_IRQ_NODES 16 #define NUM_IRQ_NODES 16
static irq_node_t nodes[NUM_IRQ_NODES]; static irq_node_t nodes[NUM_IRQ_NODES];
...@@ -82,8 +81,6 @@ void __init init_IRQ(void) ...@@ -82,8 +81,6 @@ void __init init_IRQ(void)
if (mach_init_IRQ) if (mach_init_IRQ)
mach_init_IRQ(); mach_init_IRQ();
mach_kstat_irqs = &kstat.irqs[0][0];
} }
irq_node_t *new_irq_node(void) irq_node_t *new_irq_node(void)
...@@ -233,7 +230,7 @@ asmlinkage void process_int(unsigned long vec, struct pt_regs *fp) ...@@ -233,7 +230,7 @@ asmlinkage void process_int(unsigned long vec, struct pt_regs *fp)
{ {
if (vec >= VEC_INT1 && vec <= VEC_INT7) { if (vec >= VEC_INT1 && vec <= VEC_INT7) {
vec -= VEC_SPUR; vec -= VEC_SPUR;
kstat.irqs[0][vec]++; kstat_cpu(0).irqs[vec]++;
irq_list[vec].handler(vec, irq_list[vec].dev_id, fp); irq_list[vec].handler(vec, irq_list[vec].dev_id, fp);
} else { } else {
if (mach_process_int) if (mach_process_int)
...@@ -254,7 +251,7 @@ int show_interrupts(struct seq_file *p, void *v) ...@@ -254,7 +251,7 @@ int show_interrupts(struct seq_file *p, void *v)
continue; continue;
seq_printf(p, "%3d: %10u ", i, seq_printf(p, "%3d: %10u ", i,
(i ? kstat.irqs[0][i] : num_spurious)); (i ? kstat_cpu(0).irqs[i] : num_spurious));
if (irq_list[i].flags & IRQ_FLG_LOCK) if (irq_list[i].flags & IRQ_FLG_LOCK)
seq_printf(p, "L "); seq_printf(p, "L ");
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment