From 42b477214daf80a34ca15193f1dd5d52326e54b8 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Fri, 15 Feb 2013 13:30:58 +0100
Subject: [PATCH] --- yaml --- r: 360874 b: refs/heads/master c:
 78305c863074f809f09a96ea97b86d0f0c1c8399 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mm/proc-v7-3level.S | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cf4ec74c85c0..386704fe18b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30a1b5ef0c953a7ba82169c46f92f52fa11ee15e
+refs/heads/master: 78305c863074f809f09a96ea97b86d0f0c1c8399
diff --git a/trunk/arch/arm/mm/proc-v7-3level.S b/trunk/arch/arm/mm/proc-v7-3level.S
index 50bf1dafc9ea..6ffd78c0f9ab 100644
--- a/trunk/arch/arm/mm/proc-v7-3level.S
+++ b/trunk/arch/arm/mm/proc-v7-3level.S
@@ -48,7 +48,7 @@
 ENTRY(cpu_v7_switch_mm)
 #ifdef CONFIG_MMU
 	mmid	r1, r1				@ get mm->context.id
-	and	r3, r1, #0xff
+	asid	r3, r1
 	mov	r3, r3, lsl #(48 - 32)		@ ASID
 	mcrr	p15, 0, r0, r3, c2		@ set TTB 0
 	isb