diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2013-02-11 06:25:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-16 12:54:27 -0500 |
| commit | 251019fb97b67067c34292bb89c19e712f91971c (patch) | |
| tree | f401e2297daacb6f81878ac1bf5fc93aec402f59 /arch | |
| parent | 9520a5bece13b7382f4b0059180f61530c423c81 (diff) | |
ARM: 7650/1: mm: replace direct access to mm->context.id with new macro
The mmid macro is meant to be used to get the mm->context.id data
from the mm structure, but it seems to have been missed in a cuple
of files.
Acked-by: Will Deacon <will.deacon@arm.com>
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')
| -rw-r--r-- | arch/arm/mm/proc-v6.S | 2 | ||||
| -rw-r--r-- | arch/arm/mm/proc-v7-2level.S | 2 | ||||
| -rw-r--r-- | arch/arm/mm/proc-v7-3level.S | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index 09c5233f4dfc..bcaaa8de9325 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S | |||
| @@ -101,7 +101,7 @@ ENTRY(cpu_v6_dcache_clean_area) | |||
| 101 | ENTRY(cpu_v6_switch_mm) | 101 | ENTRY(cpu_v6_switch_mm) |
| 102 | #ifdef CONFIG_MMU | 102 | #ifdef CONFIG_MMU |
| 103 | mov r2, #0 | 103 | mov r2, #0 |
| 104 | ldr r1, [r1, #MM_CONTEXT_ID] @ get mm->context.id | 104 | mmid r1, r1 @ get mm->context.id |
| 105 | ALT_SMP(orr r0, r0, #TTB_FLAGS_SMP) | 105 | ALT_SMP(orr r0, r0, #TTB_FLAGS_SMP) |
| 106 | ALT_UP(orr r0, r0, #TTB_FLAGS_UP) | 106 | ALT_UP(orr r0, r0, #TTB_FLAGS_UP) |
| 107 | mcr p15, 0, r2, c7, c5, 6 @ flush BTAC/BTB | 107 | mcr p15, 0, r2, c7, c5, 6 @ flush BTAC/BTB |
diff --git a/arch/arm/mm/proc-v7-2level.S b/arch/arm/mm/proc-v7-2level.S index 6d98c13ab827..78f520bc0e99 100644 --- a/arch/arm/mm/proc-v7-2level.S +++ b/arch/arm/mm/proc-v7-2level.S | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | ENTRY(cpu_v7_switch_mm) | 40 | ENTRY(cpu_v7_switch_mm) |
| 41 | #ifdef CONFIG_MMU | 41 | #ifdef CONFIG_MMU |
| 42 | mov r2, #0 | 42 | mov r2, #0 |
| 43 | ldr r1, [r1, #MM_CONTEXT_ID] @ get mm->context.id | 43 | mmid r1, r1 @ get mm->context.id |
| 44 | ALT_SMP(orr r0, r0, #TTB_FLAGS_SMP) | 44 | ALT_SMP(orr r0, r0, #TTB_FLAGS_SMP) |
| 45 | ALT_UP(orr r0, r0, #TTB_FLAGS_UP) | 45 | ALT_UP(orr r0, r0, #TTB_FLAGS_UP) |
| 46 | #ifdef CONFIG_ARM_ERRATA_430973 | 46 | #ifdef CONFIG_ARM_ERRATA_430973 |
diff --git a/arch/arm/mm/proc-v7-3level.S b/arch/arm/mm/proc-v7-3level.S index 7b56386f9496..50bf1dafc9ea 100644 --- a/arch/arm/mm/proc-v7-3level.S +++ b/arch/arm/mm/proc-v7-3level.S | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | */ | 47 | */ |
| 48 | ENTRY(cpu_v7_switch_mm) | 48 | ENTRY(cpu_v7_switch_mm) |
| 49 | #ifdef CONFIG_MMU | 49 | #ifdef CONFIG_MMU |
| 50 | ldr r1, [r1, #MM_CONTEXT_ID] @ get mm->context.id | 50 | mmid r1, r1 @ get mm->context.id |
| 51 | and r3, r1, #0xff | 51 | and r3, r1, #0xff |
| 52 | mov r3, r3, lsl #(48 - 32) @ ASID | 52 | mov r3, r3, lsl #(48 - 32) @ ASID |
| 53 | mcrr p15, 0, r0, r3, c2 @ set TTB 0 | 53 | mcrr p15, 0, r0, r3, c2 @ set TTB 0 |