summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/head_fsl_booke.S
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2010-03-16 23:39:56 -0500
committerKumar Gala <galak@kernel.crashing.org>2010-03-16 23:39:56 -0500
commit9d296cfa69b3d4abc9d556986d544f0727988eed (patch)
tree4aa2eccb919c6e84d1a1c2dcd12e4ba060803d9d /arch/powerpc/kernel/head_fsl_booke.S
parentd6ccb1f55ddf5146219707c0e71b85e3a52179b4 (diff)
downloadlinux-9d296cfa69b3d4abc9d556986d544f0727988eed.tar.gz
linux-9d296cfa69b3d4abc9d556986d544f0727988eed.tar.bz2
linux-9d296cfa69b3d4abc9d556986d544f0727988eed.zip
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>
Diffstat (limited to 'arch/powerpc/kernel/head_fsl_booke.S')
-rw-r--r--arch/powerpc/kernel/head_fsl_booke.S3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index 25793bb0e782..a7cf4934342c 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -747,9 +747,6 @@ finish_tlb_load:
#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
#ifdef CONFIG_PTE_64BIT