From 7bdd2cce9af374ff6a7999bafc75aad593f04741 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 7 Feb 2011 01:25:41 +0100
Subject: [PATCH] --- yaml --- r: 234718 b: refs/heads/master c:
 849f061c25f8951d11c7dd88f44950ccde296392 h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/kernel/irq/chip.c | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index c6452850e0fe..cc42ae1c2a86 100644
--- 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
index 3ccff4d55b39..52b10ad7bd59 100644
--- 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