diff options
author | Jon Medhurst <tixy@linaro.org> | 2012-07-18 19:05:15 +0100 |
---|---|---|
committer | Jon Medhurst <tixy@linaro.org> | 2012-07-18 19:05:15 +0100 |
commit | f8dd49dc88778b6484b201e7dbceb0d06474dc66 (patch) | |
tree | e56c603d200745d10ec1accf58c2d7bef1fbec0b /arch/arm/mm/proc-v7-3level.S | |
parent | 2d4e3b16f288d63a8fb21ee14fcece92f3548f55 (diff) | |
parent | 04730d7db446199a142a093224399d99c908d872 (diff) |
Merge branch 'tracking-armlt-misc-fixes' into integration-linux-vexpressHEADmasterintegration-linux-vexpress
Diffstat (limited to 'arch/arm/mm/proc-v7-3level.S')
-rw-r--r-- | arch/arm/mm/proc-v7-3level.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v7-3level.S b/arch/arm/mm/proc-v7-3level.S index 8de0f1dd154..6b306057be9 100644 --- a/arch/arm/mm/proc-v7-3level.S +++ b/arch/arm/mm/proc-v7-3level.S @@ -70,7 +70,9 @@ ENTRY(cpu_v7_set_pte_ext) tst r3, #1 << (55 - 32) @ L_PTE_DIRTY orreq r2, #L_PTE_RDONLY 1: strd r2, r3, [r0] - mcr p15, 0, r0, c7, c10, 1 @ flush_pte + mrc p15, 0, r3, c0, c1, 7 @ read ID_MMFR3 + tst r3, #0xf << 20 @ check the coherent walk bits + mcreq p15, 0, r0, c7, c10, 1 @ clean D-cache to PoU #endif mov pc, lr ENDPROC(cpu_v7_set_pte_ext) |