diff options
| -rw-r--r-- | kernel/irq/chip.c | 7 | ||||
| -rw-r--r-- | kernel/irq/resend.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 8775dd39ab3d..f2c4d28c508a 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c | |||
| @@ -386,6 +386,11 @@ static int compat_irq_set_wake(struct irq_data *data, unsigned int on) | |||
| 386 | return data->chip->set_wake(data->irq, on); | 386 | return data->chip->set_wake(data->irq, on); |
| 387 | } | 387 | } |
| 388 | 388 | ||
| 389 | static int compat_irq_retrigger(struct irq_data *data) | ||
| 390 | { | ||
| 391 | return data->chip->retrigger(data->irq); | ||
| 392 | } | ||
| 393 | |||
| 389 | static void compat_bus_lock(struct irq_data *data) | 394 | static void compat_bus_lock(struct irq_data *data) |
| 390 | { | 395 | { |
| 391 | data->chip->bus_lock(data->irq); | 396 | data->chip->bus_lock(data->irq); |
| @@ -458,6 +463,8 @@ void irq_chip_set_defaults(struct irq_chip *chip) | |||
| 458 | chip->irq_set_type = compat_irq_set_type; | 463 | chip->irq_set_type = compat_irq_set_type; |
| 459 | if (chip->set_wake) | 464 | if (chip->set_wake) |
| 460 | chip->irq_set_wake = compat_irq_set_wake; | 465 | chip->irq_set_wake = compat_irq_set_wake; |
| 466 | if (chip->retrigger) | ||
| 467 | chip->irq_retrigger = compat_irq_retrigger; | ||
| 461 | } | 468 | } |
| 462 | 469 | ||
| 463 | static inline void mask_ack_irq(struct irq_desc *desc) | 470 | static inline void mask_ack_irq(struct irq_desc *desc) |
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c index a798a2328f8a..891115a929aa 100644 --- a/kernel/irq/resend.c +++ b/kernel/irq/resend.c | |||
| @@ -70,8 +70,8 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq) | |||
| 70 | if ((status & (IRQ_LEVEL | IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) { | 70 | if ((status & (IRQ_LEVEL | IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) { |
| 71 | desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY; | 71 | desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY; |
| 72 | 72 | ||
| 73 | if (!desc->irq_data.chip->retrigger || | 73 | if (!desc->irq_data.chip->irq_retrigger || |
| 74 | !desc->irq_data.chip->retrigger(irq)) { | 74 | !desc->irq_data.chip->irq_retrigger(&desc->irq_data)) { |
| 75 | #ifdef CONFIG_HARDIRQS_SW_RESEND | 75 | #ifdef CONFIG_HARDIRQS_SW_RESEND |
| 76 | /* Set it pending and activate the softirq: */ | 76 | /* Set it pending and activate the softirq: */ |
| 77 | set_bit(irq, irqs_resend); | 77 | set_bit(irq, irqs_resend); |
