MIPS: Netlogic: use branch instead of jump

Fix an issue in the reset code. Since this code is copied to the
reset vector, using 'j' for looping is not correct. Use relative
branch 'b'.

Update the usage of 'j' in smpboot.S to be consistent although it
is not a bug there.

Signed-off-by: Jayachandran C <[email protected]>
Cc: [email protected]
Patchwork: https://patchwork.linux-mips.org/patch/5427/
Signed-off-by: Ralf Baechle <[email protected]>

diff --git a/arch/mips/netlogic/common/reset.S b/arch/mips/netlogic/common/reset.S
index b11691c629d0cbce602a2c34b2cf613060745214..0ebd50a1d618a084fd5645427dfd9e64925247f3 100644 (file)
--- a/arch/mips/netlogic/common/reset.S
+++ b/arch/mips/netlogic/common/reset.S
@@ -226,7 +226,7 @@ EXPORT(nlm_boot_siblings)
        sw      t2, 0(t1)
        /* Wait until NMI hits */
 3:     wait
-       j       3b
+       b       3b
        nop
 
        /*

diff --git a/arch/mips/netlogic/common/smpboot.S b/arch/mips/netlogic/common/smpboot.S
index 6029d1b37f8835643fe8f9936ccabf31d5970cc6..528c46c5a17028996cec33db25cb39ba258d8c9f 100644 (file)
--- a/arch/mips/netlogic/common/smpboot.S
+++ b/arch/mips/netlogic/common/smpboot.S
@@ -137,7 +137,7 @@ NESTED(nlm_rmiboot_preboot, 16, sp)
        mtcr    t1, t0          /* update core control */
 
 1:     wait
-       j       1b
+       b       1b
        nop
 END(nlm_rmiboot_preboot)
        __FINIT