diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-03-19 16:23:55 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-03-19 16:23:55 +1100 |
| commit | d6a8536a93a3d14b6e5e3e3a59b9fb2bca6e8df2 (patch) | |
| tree | 14de9959c93e56a8d165670faaa7ea3699da7f8e /arch/powerpc/kernel | |
| parent | bca14dd14f3b0c5e3e2d1d314679f85b67871365 (diff) | |
| parent | 9d296cfa69b3d4abc9d556986d544f0727988eed (diff) | |
Merge commit 'kumar/merge' into merge
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/head_fsl_booke.S | 3 |
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 25793bb0e78..a7cf4934342 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 |