From 1a752644dc3e2cd8b7d58ea3c053c4182c2a81e6 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 27 Sep 2010 12:45:53 +0000
Subject: [PATCH] --- yaml --- r: 212155 b: refs/heads/master c:
 21e2b8c62cca8f7dbec0c8c131ca1637e4a5670f h: refs/heads/master i:   212153:
 6d49fb6821c5cb64988b6ff9b0c114816cae1d0f   212151:
 94056ac3c2f2ba825d54c1b348a926ba1d507901 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/irq/chip.c   | 7 +++++++
 trunk/kernel/irq/resend.c | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1a1940d4eda5..fd4b1e355ac1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f7e99bb9be6a2d8d7b808dc86037710cc8b7bf1
+refs/heads/master: 21e2b8c62cca8f7dbec0c8c131ca1637e4a5670f
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
index 8775dd39ab3d..f2c4d28c508a 100644
--- a/trunk/kernel/irq/chip.c
+++ b/trunk/kernel/irq/chip.c
@@ -386,6 +386,11 @@ static int compat_irq_set_wake(struct irq_data *data, unsigned int on)
 	return data->chip->set_wake(data->irq, on);
 }
 
+static int compat_irq_retrigger(struct irq_data *data)
+{
+	return data->chip->retrigger(data->irq);
+}
+
 static void compat_bus_lock(struct irq_data *data)
 {
 	data->chip->bus_lock(data->irq);
@@ -458,6 +463,8 @@ void irq_chip_set_defaults(struct irq_chip *chip)
 		chip->irq_set_type = compat_irq_set_type;
 	if (chip->set_wake)
 		chip->irq_set_wake = compat_irq_set_wake;
+	if (chip->retrigger)
+		chip->irq_retrigger = compat_irq_retrigger;
 }
 
 static inline void mask_ack_irq(struct irq_desc *desc)
diff --git a/trunk/kernel/irq/resend.c b/trunk/kernel/irq/resend.c
index a798a2328f8a..891115a929aa 100644
--- a/trunk/kernel/irq/resend.c
+++ b/trunk/kernel/irq/resend.c
@@ -70,8 +70,8 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
 	if ((status & (IRQ_LEVEL | IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
 		desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;
 
-		if (!desc->irq_data.chip->retrigger ||
-		    !desc->irq_data.chip->retrigger(irq)) {
+		if (!desc->irq_data.chip->irq_retrigger ||
+		    !desc->irq_data.chip->irq_retrigger(&desc->irq_data)) {
 #ifdef CONFIG_HARDIRQS_SW_RESEND
 			/* Set it pending and activate the softirq: */
 			set_bit(irq, irqs_resend);