Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Tue, 18 Oct 2016 04:31:07 +0000 (12:31 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 18 Oct 2016 04:31:07 +0000 (12:31 +0800)
1  2 
arch/arm/boot/compressed/head.S
kernel/cpuset.c
kernel/events/core.c
kernel/fork.c
kernel/sysctl.c

index ae85dcdcb7df105abdc399ce619c5413c0b63f5d,856913705169f089e55bcc41c1483e08a31a59db..d2e43b053d9b61b7ab90478d8c41041b9457baa0
@@@ -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
diff --cc kernel/cpuset.c
Simple merge
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge