Merge tag 'metag-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...

[karo-tx-linux.git] / arch / metag / kernel / irq.c

diff --git a/arch/metag/kernel/irq.c b/arch/metag/kernel/irq.c
index 87707efeb0a39b20e764c0d73e46825b49c4ea1b..2a2c9d55187e075375e892abbc4e23139f63bf86 100644 (file)
--- a/arch/metag/kernel/irq.c
+++ b/arch/metag/kernel/irq.c
@@ -25,7 +25,7 @@ static union irq_ctx *hardirq_ctx[NR_CPUS] __read_mostly;
 static union irq_ctx *softirq_ctx[NR_CPUS] __read_mostly;
 #endif
 
-struct irq_domain *root_domain;
+static struct irq_domain *root_domain;
 
 static unsigned int startup_meta_irq(struct irq_data *data)
 {
@@ -279,11 +279,12 @@ static void route_irq(struct irq_data *data, unsigned int irq, unsigned int cpu)
 {
        struct irq_desc *desc = irq_to_desc(irq);
        struct irq_chip *chip = irq_data_get_irq_chip(data);
+       unsigned long flags;
 
-       raw_spin_lock_irq(&desc->lock);
+       raw_spin_lock_irqsave(&desc->lock, flags);
        if (chip->irq_set_affinity)
                chip->irq_set_affinity(data, cpumask_of(cpu), false);
-       raw_spin_unlock_irq(&desc->lock);
+       raw_spin_unlock_irqrestore(&desc->lock, flags);
 }
 
 /*