lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'kumar/merge' into merge

Browse Source
This commit is contained in:
Benjamin Herrenschmidt
2010-03-19 16:23:55 +11:00
parent bca14dd14f 9d296cfa69
commit d6a8536a93
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/kernel/head_fsl_booke.S
View File

@@ -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