diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2015-07-30 00:13:24 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-07-30 00:13:24 +0200 |
| commit | 4b979e4c611ce750d32b51737f837b485f43c69b (patch) | |
| tree | 3bc56f2a22d2cf29bc183b67e74e1e8c0733efc0 /kernel/irq/resend.c | |
| parent | xtensa/irq: Use access helper irq_data_get_affinity_mask() (diff) | |
| parent | Linux 4.2-rc4 (diff) | |
| download | linux-dev-4b979e4c611ce750d32b51737f837b485f43c69b.tar.xz linux-dev-4b979e4c611ce750d32b51737f837b485f43c69b.zip | |
Merge branch 'linus' into irq/core
Pull in upstream fixes before applying conflicting changes
Diffstat (limited to 'kernel/irq/resend.c')
| -rw-r--r-- | kernel/irq/resend.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c index 32fc47c2c622..dd95f44f99b2 100644 --- a/kernel/irq/resend.c +++ b/kernel/irq/resend.c @@ -77,13 +77,21 @@ void check_irq_resend(struct irq_desc *desc) unsigned int irq = irq_desc_get_irq(desc); /* - * If the interrupt has a parent irq and runs - * in the thread context of the parent irq, - * retrigger the parent. + * If the interrupt is running in the thread + * context of the parent irq we need to be + * careful, because we cannot trigger it + * directly. */ - if (desc->parent_irq && - irq_settings_is_nested_thread(desc)) + if (irq_settings_is_nested_thread(desc)) { + /* + * If the parent_irq is valid, we + * retrigger the parent, otherwise we + * do nothing. + */ + if (!desc->parent_irq) + return; irq = desc->parent_irq; + } /* Set it pending and activate the softirq: */ set_bit(irq, irqs_resend); tasklet_schedule(&resend_tasklet); |