diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ns9xxx/irq.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index 363db186cb93..7296f0416286 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c | |||
@@ -76,7 +76,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
76 | 76 | ||
77 | seq_printf(p, "%3d: ", i); | 77 | seq_printf(p, "%3d: ", i); |
78 | for_each_present_cpu(cpu) | 78 | for_each_present_cpu(cpu) |
79 | seq_printf(p, "%10u ", kstat_cpu(cpu).irqs[i]); | 79 | seq_printf(p, "%10u ", kstat_irqs_cpu(i, cpu)); |
80 | seq_printf(p, " %10s", irq_desc[i].chip->name ? : "-"); | 80 | seq_printf(p, " %10s", irq_desc[i].chip->name ? : "-"); |
81 | seq_printf(p, " %s", action->name); | 81 | seq_printf(p, " %s", action->name); |
82 | for (action = action->next; action; action = action->next) | 82 | for (action = action->next; action; action = action->next) |
diff --git a/arch/arm/mach-ns9xxx/irq.c b/arch/arm/mach-ns9xxx/irq.c index 22e0eb6e9ec4..feb0e54a91de 100644 --- a/arch/arm/mach-ns9xxx/irq.c +++ b/arch/arm/mach-ns9xxx/irq.c | |||
@@ -63,7 +63,6 @@ static struct irq_chip ns9xxx_chip = { | |||
63 | #else | 63 | #else |
64 | static void handle_prio_irq(unsigned int irq, struct irq_desc *desc) | 64 | static void handle_prio_irq(unsigned int irq, struct irq_desc *desc) |
65 | { | 65 | { |
66 | unsigned int cpu = smp_processor_id(); | ||
67 | struct irqaction *action; | 66 | struct irqaction *action; |
68 | irqreturn_t action_ret; | 67 | irqreturn_t action_ret; |
69 | 68 | ||
@@ -72,7 +71,7 @@ static void handle_prio_irq(unsigned int irq, struct irq_desc *desc) | |||
72 | BUG_ON(desc->status & IRQ_INPROGRESS); | 71 | BUG_ON(desc->status & IRQ_INPROGRESS); |
73 | 72 | ||
74 | desc->status &= ~(IRQ_REPLAY | IRQ_WAITING); | 73 | desc->status &= ~(IRQ_REPLAY | IRQ_WAITING); |
75 | kstat_cpu(cpu).irqs[irq]++; | 74 | kstat_incr_irqs_this_cpu(irq, desc); |
76 | 75 | ||
77 | action = desc->action; | 76 | action = desc->action; |
78 | if (unlikely(!action || (desc->status & IRQ_DISABLED))) | 77 | if (unlikely(!action || (desc->status & IRQ_DISABLED))) |