From 8d628a30581635c414695f33bb7a52b95dbbb9aa Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 28 Feb 2013 17:47:20 +0100 Subject: [PATCH] --- yaml --- r: 360877 b: refs/heads/master c: 37f47e3d62533c931b04cb409f2eb299e6342331 h: refs/heads/master i: 360875: 83251fcca81c00388823358a36d7679049b5a980 v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/context.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e7e8ab0840a4..221c3a2ffeb6 100644 --- 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 index 7a0511191f6b..03ba181e359c 100644 --- 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: