diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-24 14:36:45 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-24 14:36:45 +1000 |
commit | b1515af2911c4339ed34865a0594f4ad3392921a (patch) | |
tree | cae6a1367452d4dcef76e5e7711511c2fc4087c3 /arch/powerpc/mm | |
parent | d1b113bb028999e82a8528e1484be8c23fb5a7d9 (diff) | |
parent | 32412aa214e05308833a89e6090406294833f989 (diff) | |
download | op-kernel-dev-b1515af2911c4339ed34865a0594f4ad3392921a.zip op-kernel-dev-b1515af2911c4339ed34865a0594f4ad3392921a.tar.gz |
Merge remote branch 'jwb/merge' into merge
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r-- | arch/powerpc/mm/tlb_nohash_low.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/mm/tlb_nohash_low.S b/arch/powerpc/mm/tlb_nohash_low.S index cfa7682..b9d9fed 100644 --- a/arch/powerpc/mm/tlb_nohash_low.S +++ b/arch/powerpc/mm/tlb_nohash_low.S @@ -200,6 +200,7 @@ _GLOBAL(_tlbivax_bcast) rlwimi r5,r4,0,16,31 wrteei 0 mtspr SPRN_MMUCR,r5 + isync /* tlbivax 0,r3 - use .long to avoid binutils deps */ .long 0x7c000624 | (r3 << 11) isync |