diff options
author | Paul Mackerras <paulus@samba.org> | 2008-12-16 14:38:58 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-12-16 14:38:58 +1100 |
commit | 1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a (patch) | |
tree | 0cf88547108a750d6eb910564ef5bf0ffb5ceef3 /arch/powerpc/kernel/misc_32.S | |
parent | 91cac623262c1c0cd298c5c648a8bd2b647c264d (diff) | |
parent | 23e0e8afafd9ac065d81506524adf3339584044b (diff) | |
download | kernel_samsung_smdk4412-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.zip kernel_samsung_smdk4412-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.tar.gz kernel_samsung_smdk4412-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.tar.bz2 |
Merge branch 'merge' into next
Diffstat (limited to 'arch/powerpc/kernel/misc_32.S')
-rw-r--r-- | arch/powerpc/kernel/misc_32.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index bdc8b0e..d108715 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S @@ -479,6 +479,8 @@ _GLOBAL(_tlbil_pid) * (no broadcast) */ _GLOBAL(_tlbil_va) + mfmsr r10 + wrteei 0 slwi r4,r4,16 mtspr SPRN_MAS6,r4 /* assume AS=0 for now */ tlbsx 0,r3 @@ -490,6 +492,7 @@ _GLOBAL(_tlbil_va) tlbwe msync isync + wrtee r10 blr #endif /* CONFIG_FSL_BOOKE */ |