diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 10:55:23 -0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 10:55:23 -0400 |
| commit | b757f17e9184b65428c48a281d82f9acb3e96f0e (patch) | |
| tree | 7dc22c9f82f78c20caeff00fdd68a2e92e40504a /drivers/irqchip/irq-gic.c | |
| parent | 3c76a8a95daeecd881718f88324041f6a5faab86 (diff) | |
| parent | da497f6fbaa190d34907ecc9dd85cfc62ba9f5a2 (diff) | |
Merge tag 'tags/soc_for_v3.10' into mvebu/dt
Pulling in mvebu branches which contain changes to armada*.dts? files for LPAE
conversion.
mvebu soc changes for v3.10
- use the mvebu-mbus driver
- prep for LPAE support
Depends:
- mvebu/cleanup (tags/cleanup_for_v3.10)
- mvebu/drivers (tags/drivers_for_v3.10)
Diffstat (limited to 'drivers/irqchip/irq-gic.c')
| -rw-r--r-- | drivers/irqchip/irq-gic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 644d72468423..a32e0d5aa45f 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c | |||
| @@ -648,7 +648,7 @@ void gic_raise_softirq(const struct cpumask *mask, unsigned int irq) | |||
| 648 | 648 | ||
| 649 | /* Convert our logical CPU mask into a physical one. */ | 649 | /* Convert our logical CPU mask into a physical one. */ |
| 650 | for_each_cpu(cpu, mask) | 650 | for_each_cpu(cpu, mask) |
| 651 | map |= 1 << cpu_logical_map(cpu); | 651 | map |= gic_cpu_map[cpu]; |
| 652 | 652 | ||
| 653 | /* | 653 | /* |
| 654 | * Ensure that stores to Normal memory are visible to the | 654 | * Ensure that stores to Normal memory are visible to the |