---

yaml --- r: 188818 b: refs/heads/master c: 9d296cf h: refs/heads/master v: v3
git-mirror · Mar 17, 2010 · a017326 · a017326
1 parent d13f1f5
commit a017326
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6ccb1f55ddf5146219707c0e71b85e3a52179b4
+refs/heads/master: 9d296cfa69b3d4abc9d556986d544f0727988eed
diff --git a/trunk/arch/powerpc/kernel/head_fsl_booke.S b/trunk/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