From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 29 Jul 2015 22:13:24 +0000 (+0200)
Subject: Merge branch 'linus' into irq/core
X-Git-Tag: firefly_0821_release~176^2~1122^2~49
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=4b979e4c611ce750d32b51737f837b485f43c69b;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linus' into irq/core

Pull in upstream fixes before applying conflicting changes
---

4b979e4c611ce750d32b51737f837b485f43c69b
diff --cc kernel/irq/resend.c
index 32fc47c2c622,7a5237a1bce5..dd95f44f99b2
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@@ -74,16 -74,22 +74,24 @@@ void check_irq_resend(struct irq_desc *
  		if (!desc->irq_data.chip->irq_retrigger ||
  		    !desc->irq_data.chip->irq_retrigger(&desc->irq_data)) {
  #ifdef CONFIG_HARDIRQS_SW_RESEND
 +			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);