revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / arch / arm / mm / proc-v7.S

diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 8cdf3bf2671984e5068d4d989c332805b3e73508..197f21bed5e919f3a13f3cbc9404d428ad80fb97 100644 (file)
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -302,12 +302,8 @@ __v7_setup:
         *   NS1 = PRRR[19] = 1         - normal shareable property
         *   NOS = PRRR[24+n] = 1       - not outer shareable
         */
-       ldr     r5, =0xff0a89a8                 @ PRRR
-#ifdef CONFIG_SMP
-       ldr     r6, =0xc0e0c4e0                 @ NMRR
-#else
-       ldr     r6, =0x40e044e0
-#endif
+       ldr     r5, =0xff0a81a8                 @ PRRR
+       ldr     r6, =0x40e040e0                 @ NMRR
        mcr     p15, 0, r5, c10, c2, 0          @ write PRRR
        mcr     p15, 0, r6, c10, c2, 1          @ write NMRR
 #endif