powerpc/fsl-booke: Get coherent bit from PTE

We shouldn't be always setting 'M' in the TLB entry since its reasonable
for somethings to be mapped non-coherent.  The PTE should have 'M' set
properly.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index 25793bb0e7828ad5c60ff550bbb19ec832e8a30d..a7cf4934342c1f9e7dbb56adfaa6656023131a5e 100644 (file)
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -746,9 +746,6 @@ finish_tlb_load:
        rlwimi  r12, r11, 32-19, 27, 31 /* extract WIMGE from pte */
 #else
        rlwimi  r12, r11, 26, 27, 31    /* extract WIMGE from pte */
-#endif
-#ifdef CONFIG_SMP
-       ori     r12, r12, MAS2_M
 #endif
        mtspr   SPRN_MAS2, r12