Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / arch / mips / netlogic / common / smpboot.S

diff --git a/arch/mips/netlogic/common/smpboot.S b/arch/mips/netlogic/common/smpboot.S
index f0cc4c9de2bbcdc655b861f189f16bebb9ea7d8b..509c1a7e7c05b1ac7284663031b4d16ed2aad0aa 100644 (file)
--- a/arch/mips/netlogic/common/smpboot.S
+++ b/arch/mips/netlogic/common/smpboot.S
@@ -59,8 +59,8 @@ NESTED(xlp_boot_core0_siblings, PT_SIZE, sp)
        sync
        /* find the location to which nlm_boot_siblings was relocated */
        li      t0, CKSEG1ADDR(RESET_VEC_PHYS)
-       dla     t1, nlm_reset_entry
-       dla     t2, nlm_boot_siblings
+       PTR_LA  t1, nlm_reset_entry
+       PTR_LA  t2, nlm_boot_siblings
        dsubu   t2, t1
        daddu   t2, t0
        /* call it */