From: Kumar Gala <galak@kernel.crashing.org>
Date: Wed, 17 Mar 2010 04:39:56 +0000 (-0500)
Subject: powerpc/fsl-booke: Get coherent bit from PTE
X-Git-Tag: v2.6.34-rc2~4^2~4^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d296cfa69b3d4abc9d556986d544f0727988eed;p=thirdparty%2Fkernel%2Flinux.git

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 25793bb0e7828..a7cf4934342c1 100644
--- 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