From: Mark Brown <broonie@linaro.org>
Date: Fri, 11 Oct 2013 18:26:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/big.LITTLE' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~197^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fa4b900fcaa6092a43fd60fe7dd72f8df654bcde;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/big.LITTLE' into linux-linaro-lsk
---

fa4b900fcaa6092a43fd60fe7dd72f8df654bcde
diff --cc drivers/irqchip/irq-gic.c
index 6f00dfa7d4fd,5dc511c58722..65bc83747f66
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@@ -651,13 -647,13 +652,15 @@@ static void __init gic_pm_init(struct g
  void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)
  {
  	int cpu;
 -	unsigned long map = 0;
 +	unsigned long flags, map = 0;
 +
 +	raw_spin_lock_irqsave(&irq_controller_lock, flags);
  
  	/* Convert our logical CPU mask into a physical one. */
- 	for_each_cpu(cpu, mask)
+ 	for_each_cpu(cpu, mask) {
+ 		trace_arm_ipi_send(irq, cpu);
  		map |= gic_cpu_map[cpu];
+ 	}
  
  	/*
  	 * Ensure that stores to Normal memory are visible to the