diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-01-15 14:22:35 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-01-15 14:22:35 +1100 |
| commit | fac515db45207718168cb55ca4d0a390e43b61af (patch) | |
| tree | 7dd2fe9b94f769a2009ff6c7402c52ef3dd3b640 /arch/powerpc/mm/tlb_nohash_low.S | |
| parent | 3ac8ff1c475bda7174fce63230c0932454287cd5 (diff) | |
| parent | d064f30e5063ec54ab50af08c64fb5055e759bfd (diff) | |
| download | op-kernel-dev-fac515db45207718168cb55ca4d0a390e43b61af.zip op-kernel-dev-fac515db45207718168cb55ca4d0a390e43b61af.tar.gz | |
Merge remote-tracking branch 'scott/next' into next
Freescale updates from Scott:
<<
Highlights include 32-bit booke relocatable support, e6500 hardware
tablewalk support, various e500 SPE fixes, some new/revived boards, and
e6500 deeper idle and altivec powerdown modes.
>>
Diffstat (limited to 'arch/powerpc/mm/tlb_nohash_low.S')
| -rw-r--r-- | arch/powerpc/mm/tlb_nohash_low.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/mm/tlb_nohash_low.S b/arch/powerpc/mm/tlb_nohash_low.S index 626ad08..43ff3c7 100644 --- a/arch/powerpc/mm/tlb_nohash_low.S +++ b/arch/powerpc/mm/tlb_nohash_low.S @@ -402,7 +402,9 @@ _GLOBAL(set_context) * Load TLBCAM[index] entry in to the L2 CAM MMU */ _GLOBAL(loadcam_entry) - LOAD_REG_ADDR(r4, TLBCAM) + mflr r5 + LOAD_REG_ADDR_PIC(r4, TLBCAM) + mtlr r5 mulli r5,r3,TLBCAM_SIZE add r3,r5,r4 lwz r4,TLBCAM_MAS0(r3) |
