---

yaml --- r: 234718 b: refs/heads/master c: 849f061 h: refs/heads/master v: v3
git-mirror · Feb 19, 2011 · 7bdd2cc · 7bdd2cc
1 parent 1479d88
commit 7bdd2cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a60a5dc2db3b08b3c2900614c43b1262410c2d8c
+refs/heads/master: 849f061c25f8951d11c7dd88f44950ccde296392
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
@@ -618,19 +618,17 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
 void
 handle_percpu_irq(unsigned int irq, struct irq_desc *desc)
 {
-	irqreturn_t action_ret;
+	struct irq_chip *chip = get_irq_desc_chip(desc);
 
 	kstat_incr_irqs_this_cpu(irq, desc);
 
-	if (desc->irq_data.chip->irq_ack)
-		desc->irq_data.chip->irq_ack(&desc->irq_data);
+	if (chip->irq_ack)
+		chip->irq_ack(&desc->irq_data);
 
-	action_ret = handle_IRQ_event(irq, desc->action);
-	if (!noirqdebug)
-		note_interrupt(irq, desc, action_ret);
+	handle_irq_event_percpu(desc, desc->action);
 
-	if (desc->irq_data.chip->irq_eoi)
-		desc->irq_data.chip->irq_eoi(&desc->irq_data);
+	if (chip->irq_eoi)
+		chip->irq_eoi(&desc->irq_data);
 }
 
 void