diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-19 18:01:24 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-19 18:01:24 -0400 |
| commit | ae6c859b7dcd708efadf1c76279c33db213e3506 (patch) | |
| tree | c18c2e94537d5e3d4fde5bf52800333b7c237048 /arch | |
| parent | 5b4b7a236e7787f16af4e15a6253d46d8e794be6 (diff) | |
| parent | 427abfa28afedffadfca9dd8b067eb6d36bac53f (diff) | |
merge linus into release branch
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/mm/hash_native_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c index 33654d1b1b43..994856e55b7c 100644 --- a/arch/powerpc/mm/hash_native_64.c +++ b/arch/powerpc/mm/hash_native_64.c | |||
| @@ -52,7 +52,7 @@ static inline void __tlbie(unsigned long va, unsigned int psize) | |||
| 52 | default: | 52 | default: |
| 53 | penc = mmu_psize_defs[psize].penc; | 53 | penc = mmu_psize_defs[psize].penc; |
| 54 | va &= ~((1ul << mmu_psize_defs[psize].shift) - 1); | 54 | va &= ~((1ul << mmu_psize_defs[psize].shift) - 1); |
| 55 | va |= (0x7f >> (8 - penc)) << 12; | 55 | va |= penc << 12; |
| 56 | asm volatile("tlbie %0,1" : : "r" (va) : "memory"); | 56 | asm volatile("tlbie %0,1" : : "r" (va) : "memory"); |
| 57 | break; | 57 | break; |
| 58 | } | 58 | } |
| @@ -74,7 +74,7 @@ static inline void __tlbiel(unsigned long va, unsigned int psize) | |||
| 74 | default: | 74 | default: |
| 75 | penc = mmu_psize_defs[psize].penc; | 75 | penc = mmu_psize_defs[psize].penc; |
| 76 | va &= ~((1ul << mmu_psize_defs[psize].shift) - 1); | 76 | va &= ~((1ul << mmu_psize_defs[psize].shift) - 1); |
| 77 | va |= (0x7f >> (8 - penc)) << 12; | 77 | va |= penc << 12; |
| 78 | asm volatile(".long 0x7c000224 | (%0 << 11) | (1 << 21)" | 78 | asm volatile(".long 0x7c000224 | (%0 << 11) | (1 << 21)" |
| 79 | : : "r"(va) : "memory"); | 79 | : : "r"(va) : "memory"); |
| 80 | break; | 80 | break; |