diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2016-09-02 15:18:21 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-06-05 21:16:46 +0100 |
| commit | c0770c4cd769ffef28f26ade2c8894cfdcdae930 (patch) | |
| tree | 9ba1a4da25c3820551ad71c119a5bfd28f10531c /arch | |
| parent | c6b5d15aace719ef983782eecabecbb5325aa059 (diff) | |
| download | linux-stable-c0770c4cd769ffef28f26ade2c8894cfdcdae930.tar.gz linux-stable-c0770c4cd769ffef28f26ade2c8894cfdcdae930.tar.bz2 linux-stable-c0770c4cd769ffef28f26ade2c8894cfdcdae930.zip | |
MIPS: Netlogic: Fix assembler warning from smpboot.S
commit a8b3b0c94ac282628f0668d1366239a3fa72dc9d upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/netlogic/common/smpboot.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/netlogic/common/smpboot.S b/arch/mips/netlogic/common/smpboot.S index 805355b0bd05..deeac1243bc2 100644 --- a/arch/mips/netlogic/common/smpboot.S +++ b/arch/mips/netlogic/common/smpboot.S @@ -61,8 +61,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 */ |