diff options
| author | Benjamin Herrenschmidt | 2010-08-24 06:36:45 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2010-08-24 06:36:45 +0200 |
| commit | b1515af2911c4339ed34865a0594f4ad3392921a (patch) | |
| tree | cae6a1367452d4dcef76e5e7711511c2fc4087c3 /arch/powerpc/mm | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | powerpc/47x: Add an isync before the tlbivax instruction (diff) | |
| download | kernel-qcow2-linux-b1515af2911c4339ed34865a0594f4ad3392921a.tar.gz kernel-qcow2-linux-b1515af2911c4339ed34865a0594f4ad3392921a.tar.xz kernel-qcow2-linux-b1515af2911c4339ed34865a0594f4ad3392921a.zip | |
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 cfa768203d08..b9d9fed8f36e 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 |