Skip to content

L
linux
Commit 9652c8db authored by Paul Mackerras's avatar Paul Mackerras
Browse files
Options

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

into samba.org:/home/paulus/kernel/for-linus-ppc
parents eb40c469 e17d30b6
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
arch/ppc/kernel/irq.c
View file @ 9652c8db
...@@ -420,10 +420,9 @@ void ppc_irq_dispatch_handler(struct pt_regs *regs, int irq) ...@@ -420,10 +420,9 @@ void ppc_irq_dispatch_handler(struct pt_regs *regs, int irq)
{ {
int status; int status;
struct irqaction *action; struct irqaction *action;
int cpu = smp_processor_id();
irq_desc_t *desc = irq_desc + irq; irq_desc_t *desc = irq_desc + irq;
kstat_cpu(cpu).irqs[irq]++; kstat_this_cpu.irqs[irq]++;
spin_lock(&desc->lock); spin_lock(&desc->lock);
ack_irq(irq); ack_irq(irq);
/* /*
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7