aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-integrator/core.c')
-rw-r--r--arch/arm/mach-integrator/core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 77315b995681..0c20cf638575 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -205,7 +205,7 @@ static struct amba_pl010_data integrator_uart_data = {
205 205
206#define CM_CTRL IO_ADDRESS(INTEGRATOR_HDR_CTRL) 206#define CM_CTRL IO_ADDRESS(INTEGRATOR_HDR_CTRL)
207 207
208static DEFINE_SPINLOCK(cm_lock); 208static DEFINE_RAW_SPINLOCK(cm_lock);
209 209
210/** 210/**
211 * cm_control - update the CM_CTRL register. 211 * cm_control - update the CM_CTRL register.
@@ -217,10 +217,10 @@ void cm_control(u32 mask, u32 set)
217 unsigned long flags; 217 unsigned long flags;
218 u32 val; 218 u32 val;
219 219
220 spin_lock_irqsave(&cm_lock, flags); 220 raw_spin_lock_irqsave(&cm_lock, flags);
221 val = readl(CM_CTRL) & ~mask; 221 val = readl(CM_CTRL) & ~mask;
222 writel(val | set, CM_CTRL); 222 writel(val | set, CM_CTRL);
223 spin_unlock_irqrestore(&cm_lock, flags); 223 raw_spin_unlock_irqrestore(&cm_lock, flags);
224} 224}
225 225
226EXPORT_SYMBOL(cm_control); 226EXPORT_SYMBOL(cm_control);