| Subject: arm-omap-make-wakeupgen_lock-raw.patch |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Wed, 11 Apr 2012 11:26:38 +0200 |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| --- |
| arch/arm/mach-omap2/omap-wakeupgen.c | 14 +++++++------- |
| 1 file changed, 7 insertions(+), 7 deletions(-) |
| |
| Index: linux-stable/arch/arm/mach-omap2/omap-wakeupgen.c |
| =================================================================== |
| --- linux-stable.orig/arch/arm/mach-omap2/omap-wakeupgen.c |
| +++ linux-stable/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_da |
| { |
| 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_ |
| { |
| 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(unsign |
| { |
| 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(unsign |
| _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 |
| |