diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-24 00:36:45 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-24 00:36:45 -0400 |
| commit | b1515af2911c4339ed34865a0594f4ad3392921a (patch) | |
| tree | cae6a1367452d4dcef76e5e7711511c2fc4087c3 /arch/powerpc/mm | |
| parent | d1b113bb028999e82a8528e1484be8c23fb5a7d9 (diff) | |
| parent | 32412aa214e05308833a89e6090406294833f989 (diff) | |
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) | |||
| 200 | rlwimi r5,r4,0,16,31 | 200 | rlwimi r5,r4,0,16,31 |
| 201 | wrteei 0 | 201 | wrteei 0 |
| 202 | mtspr SPRN_MMUCR,r5 | 202 | mtspr SPRN_MMUCR,r5 |
| 203 | isync | ||
| 203 | /* tlbivax 0,r3 - use .long to avoid binutils deps */ | 204 | /* tlbivax 0,r3 - use .long to avoid binutils deps */ |
| 204 | .long 0x7c000624 | (r3 << 11) | 205 | .long 0x7c000624 | (r3 << 11) |
| 205 | isync | 206 | isync |