aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/irqchip
diff options
context:
space:
mode:
authorArnaud Ebalard <arno@natisbad.org>2014-01-20 16:52:05 -0500
committerJason Cooper <jason@lakedaemon.net>2014-01-20 19:55:47 -0500
commit19e61d41404fe4094c2d54943dbf883d9bbca864 (patch)
tree7cc5c3b1d2d6fa94f4da818fd49227bd9593bd54 /drivers/irqchip
parentdc4910d9e93f8cc56b190dd8fc9e789135978216 (diff)
ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP)
The following appears during compilation for an Armada 370 target because 'irq_controller_lock' is used only when CONFIG_SMP is enabled: drivers/irqchip/irq-armada-370-xp.c:62:8: warning: 'irq_controller_lock' defined but not used [-Wunused-variable] Fix that warning by moving declaration of 'irq_controller_lock' inside existing #ifdef. Signed-off-by: Arnaud Ebalard <arno@natisbad.org> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'drivers/irqchip')
-rw-r--r--drivers/irqchip/irq-armada-370-xp.c4
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 @@
59#define PCI_MSI_DOORBELL_END (32) 59#define PCI_MSI_DOORBELL_END (32)
60#define PCI_MSI_DOORBELL_MASK 0xFFFF0000 60#define PCI_MSI_DOORBELL_MASK 0xFFFF0000
61 61
62static DEFINE_RAW_SPINLOCK(irq_controller_lock);
63
64static void __iomem *per_cpu_int_base; 62static void __iomem *per_cpu_int_base;
65static void __iomem *main_int_base; 63static void __iomem *main_int_base;
66static struct irq_domain *armada_370_xp_mpic_domain; 64static struct irq_domain *armada_370_xp_mpic_domain;
@@ -239,6 +237,8 @@ static inline int armada_370_xp_msi_init(struct device_node *node,
239#endif 237#endif
240 238
241#ifdef CONFIG_SMP 239#ifdef CONFIG_SMP
240static DEFINE_RAW_SPINLOCK(irq_controller_lock);
241
242static int armada_xp_set_affinity(struct irq_data *d, 242static int armada_xp_set_affinity(struct irq_data *d,
243 const struct cpumask *mask_val, bool force) 243 const struct cpumask *mask_val, bool force)
244{ 244{