Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / omap-wakeupgen.c

diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
index 8c5b5e3e3541441d6cf87076b3caddee054fea3a..f8bb3b9b6a76238af322ea1e9ee4fde52b7ac46b 100644 (file)
--- a/arch/arm/mach-omap2/omap-wakeupgen.c
+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
@@ -45,7 +45,7 @@
 
 static void __iomem *wakeupgen_base;
 static void __iomem *sar_base;
-static DEFINE_SPINLOCK(wakeupgen_lock);
+static DEFINE_RAW_SPINLOCK(wakeupgen_lock);
 static unsigned int irq_target_cpu[MAX_IRQS];
 static unsigned int irq_banks = MAX_NR_REG_BANKS;
 static unsigned int max_irqs = MAX_IRQS;
@@ -133,9 +133,9 @@ static void wakeupgen_mask(struct irq_data *d)
 {
        unsigned long flags;
 
-       spin_lock_irqsave(&wakeupgen_lock, flags);
+       raw_spin_lock_irqsave(&wakeupgen_lock, flags);
        _wakeupgen_clear(d->irq, irq_target_cpu[d->irq]);
-       spin_unlock_irqrestore(&wakeupgen_lock, flags);
+       raw_spin_unlock_irqrestore(&wakeupgen_lock, flags);
 }
 
 /*
@@ -145,9 +145,9 @@ static void wakeupgen_unmask(struct irq_data *d)
 {
        unsigned long flags;
 
-       spin_lock_irqsave(&wakeupgen_lock, flags);
+       raw_spin_lock_irqsave(&wakeupgen_lock, flags);
        _wakeupgen_set(d->irq, irq_target_cpu[d->irq]);
-       spin_unlock_irqrestore(&wakeupgen_lock, flags);
+       raw_spin_unlock_irqrestore(&wakeupgen_lock, flags);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
@@ -188,7 +188,7 @@ static void wakeupgen_irqmask_all(unsigned int cpu, unsigned int set)
 {
        unsigned long flags;
 
-       spin_lock_irqsave(&wakeupgen_lock, flags);
+       raw_spin_lock_irqsave(&wakeupgen_lock, flags);
        if (set) {
                _wakeupgen_save_masks(cpu);
                _wakeupgen_set_all(cpu, WKG_MASK_ALL);
@@ -196,7 +196,7 @@ static void wakeupgen_irqmask_all(unsigned int cpu, unsigned int set)
                _wakeupgen_set_all(cpu, WKG_UNMASK_ALL);
                _wakeupgen_restore_masks(cpu);
        }
-       spin_unlock_irqrestore(&wakeupgen_lock, flags);
+       raw_spin_unlock_irqrestore(&wakeupgen_lock, flags);
 }
 #endif