66 lines
2.1 KiB
Diff
66 lines
2.1 KiB
Diff
From a63eb39f602d7b49f9b42e1eba23f9b87afe6197 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Wed, 11 Apr 2012 11:26:38 +0200
|
|
Subject: [019/254] arm-omap-make-wakeupgen_lock-raw.patch
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
arch/arm/mach-omap2/omap-wakeupgen.c | 14 +++++++-------
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
|
|
index 42cd7fb..dbc2914 100644
|
|
--- a/arch/arm/mach-omap2/omap-wakeupgen.c
|
|
+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
|
|
@@ -43,7 +43,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[NR_IRQS];
|
|
|
|
/*
|
|
@@ -128,9 +128,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);
|
|
}
|
|
|
|
/*
|
|
@@ -140,9 +140,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
|
|
@@ -183,7 +183,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);
|
|
@@ -191,7 +191,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
|
|
|