diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-31 14:59:28 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-31 14:59:28 -0800 |
| commit | 167eeb470057adb5e9a22281d2852edc91c70473 (patch) | |
| tree | 1cd900f135b5d3c7160f0e18cbd01914d5f7e64d /drivers | |
| parent | 3f7c73023f7e317b7704d9c1c80a57bd3cc91828 (diff) | |
| parent | 19e61d41404fe4094c2d54943dbf883d9bbca864 (diff) | |
| download | linux-167eeb470057adb5e9a22281d2852edc91c70473.tar.gz linux-167eeb470057adb5e9a22281d2852edc91c70473.tar.bz2 linux-167eeb470057adb5e9a22281d2852edc91c70473.zip | |
Merge tag 'mvebu-fixes-3.13-2' of git://git.infradead.org/linux-mvebu into fixes
mvebu fixes for v3.13 (incremental #2)
- allow building and booting DT and non-DT plat-orion SoCs
- catch proper return value for kirkwood_pm_init()
- properly check return of of_iomap to solve boot hangs (mirabox, others)
- remove a compile warning on Armada 370 with non-SMP.
* tag 'mvebu-fixes-3.13-2' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP)
ARM: mvebu: Fix kernel hang in mvebu_soc_id_init() when of_iomap failed
ARM: kirkwood: kirkwood_pm_init() should return void
ARM: orion: provide C-style interrupt handler for MULTI_IRQ_HANDLER
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/irqchip/irq-armada-370-xp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index 433cc8568dec..9300bc32784e 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -59,8 +59,6 @@ #define PCI_MSI_DOORBELL_END (32) #define PCI_MSI_DOORBELL_MASK 0xFFFF0000 -static DEFINE_RAW_SPINLOCK(irq_controller_lock); - static void __iomem *per_cpu_int_base; static void __iomem *main_int_base; static struct irq_domain *armada_370_xp_mpic_domain; @@ -239,6 +237,8 @@ static inline int armada_370_xp_msi_init(struct device_node *node, #endif #ifdef CONFIG_SMP +static DEFINE_RAW_SPINLOCK(irq_controller_lock); + static int armada_xp_set_affinity(struct irq_data *d, const struct cpumask *mask_val, bool force) { |