diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-20 03:33:07 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-20 03:33:07 -0700 |
| commit | cfe0e092bc049dae999eda900994d54721e35333 (patch) | |
| tree | 61411987a5d5d89ec897a242a26b394e3ba47a19 /arch | |
| parent | 297ba5f8772a9d6f496e278a069f4065439e297a (diff) | |
| parent | a0a267ebc14e03119c2eb8517e0bfd498ee853cf (diff) | |
Merge "ARM: 8618/1: decompressor: reset ttbcr fields to use TTBR0 on ARMv7"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index ae85dcdcb7df..d2e43b053d9b 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -776,7 +776,7 @@ __armv7_mmu_cache_on: orrne r0, r0, #1 @ MMU enabled movne r1, #0xfffffffd @ domain 0 = client bic r6, r6, #1 << 31 @ 32-bit translation system - bic r6, r6, #3 << 0 @ use only ttbr0 + bic r6, r6, #(7 << 0) | (1 << 4) @ use only ttbr0 mcrne p15, 0, r3, c2, c0, 0 @ load page table pointer mcrne p15, 0, r0, c8, c7, 0 @ flush I,D TLBs mcr p15, 0, r0, c7, c5, 4 @ ISB |