OSDN Git Service

MIPS: Netlogic: Fix assembler warning from smpboot.S
authorPaul Burton <paul.burton@imgtec.com>
Fri, 2 Sep 2016 14:18:21 +0000 (15:18 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 3 Jan 2017 15:48:39 +0000 (16:48 +0100)
The netlogic platform can be built for either MIPS32 or MIPS64, and when
built for MIPS32 (as by nlm_xlr_defconfig) the use of the dla
pseudo-instruction leads to warnings such as the following from recent
versions of the GNU assembler:

  arch/mips/netlogic/common/smpboot.S: Assembler messages:
  arch/mips/netlogic/common/smpboot.S:62: Warning: dla used to load 32-bit register; recommend using la instead
  arch/mips/netlogic/common/smpboot.S:63: Warning: dla used to load 32-bit register; recommend using la instead

Avoid these warnings by using the PTR_LA macro to make use of the
appropriate la or dla pseudo-instruction for the build.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Fixes: 66d29985fab8 ("MIPS: Netlogic: Merge some of XLR/XLP wakup code")
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14185/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/netlogic/common/smpboot.S

index f0cc4c9..509c1a7 100644 (file)
@@ -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 */