Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc

[pandora-kernel.git] / arch / arm / mm / context.c

diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
index b0ee9ba..93aac06 100644 (file)
--- a/arch/arm/mm/context.c
+++ b/arch/arm/mm/context.c
@@ -16,7 +16,7 @@
 #include <asm/mmu_context.h>
 #include <asm/tlbflush.h>
 
-static DEFINE_SPINLOCK(cpu_asid_lock);
+static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
 unsigned int cpu_last_asid = ASID_FIRST_VERSION;
 #ifdef CONFIG_SMP
 DEFINE_PER_CPU(struct mm_struct *, current_mm);
@@ -31,7 +31,7 @@ DEFINE_PER_CPU(struct mm_struct *, current_mm);
 void __init_new_context(struct task_struct *tsk, struct mm_struct *mm)
 {
        mm->context.id = 0;
-       spin_lock_init(&mm->context.id_lock);
+       raw_spin_lock_init(&mm->context.id_lock);
 }
 
 static void flush_context(void)
@@ -58,7 +58,7 @@ static void set_mm_context(struct mm_struct *mm, unsigned int asid)
         * the broadcast. This function is also called via IPI so the
         * mm->context.id_lock has to be IRQ-safe.
         */
-       spin_lock_irqsave(&mm->context.id_lock, flags);
+       raw_spin_lock_irqsave(&mm->context.id_lock, flags);
        if (likely((mm->context.id ^ cpu_last_asid) >> ASID_BITS)) {
                /*
                 * Old version of ASID found. Set the new one and
@@ -67,7 +67,7 @@ static void set_mm_context(struct mm_struct *mm, unsigned int asid)
                mm->context.id = asid;
                cpumask_clear(mm_cpumask(mm));
        }
-       spin_unlock_irqrestore(&mm->context.id_lock, flags);
+       raw_spin_unlock_irqrestore(&mm->context.id_lock, flags);
 
        /*
         * Set the mm_cpumask(mm) bit for the current CPU.
@@ -117,7 +117,7 @@ void __new_context(struct mm_struct *mm)
 {
        unsigned int asid;
 
-       spin_lock(&cpu_asid_lock);
+       raw_spin_lock(&cpu_asid_lock);
 #ifdef CONFIG_SMP
        /*
         * Check the ASID again, in case the change was broadcast from
@@ -125,7 +125,7 @@ void __new_context(struct mm_struct *mm)
         */
        if (unlikely(((mm->context.id ^ cpu_last_asid) >> ASID_BITS) == 0)) {
                cpumask_set_cpu(smp_processor_id(), mm_cpumask(mm));
-               spin_unlock(&cpu_asid_lock);
+               raw_spin_unlock(&cpu_asid_lock);
                return;
        }
 #endif
@@ -153,5 +153,5 @@ void __new_context(struct mm_struct *mm)
        }
 
        set_mm_context(mm, asid);
-       spin_unlock(&cpu_asid_lock);
+       raw_spin_unlock(&cpu_asid_lock);
 }