From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 9 May 2007 09:41:28 +0000 (+0100)
Subject: Merge branches 'armv7', 'at91', 'misc' and 'omap' into devel
X-Git-Tag: v2.6.22-rc1~144^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=805f53f085346b6765eda02820721a14ce0d644f;p=linux-2.6

Merge branches 'armv7', 'at91', 'misc' and 'omap' into devel
---

805f53f085346b6765eda02820721a14ce0d644f
diff --cc arch/arm/mm/context.c
index c9e9a55862,9da43a0fdc,930c04c4f5,9da43a0fdc..fc84fcc743
--- a/arch/arm/mm/context.c
+++ b/arch/arm/mm/context.c
@@@@@ -47,14 -47,7 -49,9 -47,7 +49,16 @@@@@ void __new_context(struct mm_struct *mm
    		    : "r" (0));
    		isb();
    		flush_tlb_all();
 +++		if (icache_is_vivt_asid_tagged()) {
 +++			asm("mcr	p15, 0, %0, c7, c5, 0	@ invalidate I-cache\n"
 +++			    "mcr	p15, 0, %0, c7, c5, 6	@ flush BTAC/BTB\n"
 +++			    :
 +++			    : "r" (0));
 +++			dsb();
 +++		}
    	}
++ +	spin_unlock(&cpu_asid_lock);
    
++ +	mm->cpu_vm_mask = cpumask_of_cpu(smp_processor_id());
    	mm->context.id = asid;
    }