---

yaml --- r: 360877 b: refs/heads/master c: 37f47e3 h: refs/heads/master i: 360875: 83251fc v: v3
git-mirror · Mar 3, 2013 · 8d628a3 · 8d628a3
1 parent 7ddfbda
commit 8d628a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d61947a164760ac520cb416768afdf38c33d60e7
+refs/heads/master: 37f47e3d62533c931b04cb409f2eb299e6342331
diff --git a/trunk/arch/arm/mm/context.c b/trunk/arch/arm/mm/context.c
@@ -207,11 +207,11 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
 	if ((mm->context.id ^ atomic64_read(&asid_generation)) >> ASID_BITS)
 		new_context(mm, cpu);
 
-	atomic64_set(&per_cpu(active_asids, cpu), mm->context.id);
-	cpumask_set_cpu(cpu, mm_cpumask(mm));
-
 	if (cpumask_test_and_clear_cpu(cpu, &tlb_flush_pending))
 		local_flush_tlb_all();
+
+	atomic64_set(&per_cpu(active_asids, cpu), mm->context.id);
+	cpumask_set_cpu(cpu, mm_cpumask(mm));
 	raw_spin_unlock_irqrestore(&cpu_asid_lock, flags);
 
 switch_mm_fastpath: