From: Alex Shi Date: Tue, 18 Oct 2016 04:31:07 +0000 (+0800) Subject: Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android X-Git-Tag: firefly_0821_release~176^2~116 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a66f9577c6e5280d83d45152aea29cf5e4548858;p=firefly-linux-kernel-4.4.55.git Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android --- a66f9577c6e5280d83d45152aea29cf5e4548858 diff --cc arch/arm/boot/compressed/head.S index ae85dcdcb7df,856913705169..d2e43b053d9b --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@@ -776,10 -776,8 +776,10 @@@ __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 mcrne p15, 0, r1, c3, c0, 0 @ load domain access control mcrne p15, 0, r6, c2, c0, 2 @ load ttb control #endif