Merge samba.org:/home/paulus/kernel/linux-2.5

into samba.org:/home/paulus/kernel/for-linus-ppc

Merge samba.org:/home/paulus/kernel/linux-2.5
into samba.org:/home/paulus/kernel/for-linus-ppc
9652c8db · Paul Mackerras · eb40c469 · e17d30b6 · 9652c8db
Commit 9652c8db authored Jul 16, 2003 by Paul Mackerras
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

arch/ppc/kernel/irq.c arch/ppc/kernel/irq.c +1 -2

No files found.
--- a/arch/ppc/kernel/irq.c
+++ b/arch/ppc/kernel/irq.c
@@ -420,10 +420,9 @@ void ppc_irq_dispatch_handler(struct pt_regs *regs, int irq)
 {
 	int status;
 	struct irqaction *action;
-	int cpu = smp_processor_id();
 	irq_desc_t *desc = irq_desc + irq;

-	kstat_cpu(cpu).irqs[irq]++;
+	kstat_this_cpu.irqs[irq]++;
 	spin_lock(&desc->lock);
 	ack_irq(irq);	
 	/*