summaryrefslogtreecommitdiff
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2013-02-15 13:30:58 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-03-03 22:54:12 +0000
commit78305c863074f809f09a96ea97b86d0f0c1c8399 (patch)
tree3e23da25ae712bfc165b9927efc1e642f972d6ea /arch/arm/mm
parent30a1b5ef0c953a7ba82169c46f92f52fa11ee15e (diff)
downloadlinux-next-78305c863074f809f09a96ea97b86d0f0c1c8399.tar.gz
ARM: 7652/1: mm: fix missing use of 'asid' to get asid value from mm->context.id
Fix missing use of the asid macro when getting the ASID from the mm->context.id field. Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/proc-v7-3level.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v7-3level.S b/arch/arm/mm/proc-v7-3level.S
index 50bf1dafc9ea..6ffd78c0f9ab 100644
--- a/arch/arm/mm/proc-v7-3level.S
+++ b/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