summaryrefslogtreecommitdiff
path: root/arch/mips/netlogic
diff options
context:
space:
mode:
authorJayachandran C <jchandra@broadcom.com>2013-06-10 06:41:05 +0000
committerRalf Baechle <ralf@linux-mips.org>2013-06-13 17:46:42 +0200
commitfd5f527cc58f7112f0d2c3cf2c29ae3ea5417de5 (patch)
tree5c03ffb32ae4ec74fb59491282b9f1cd3b190952 /arch/mips/netlogic
parent919f9abb3723f088290c62648b12fbfc7600d923 (diff)
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 <jchandra@broadcom.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/5427/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/netlogic')
-rw-r--r--arch/mips/netlogic/common/reset.S2
-rw-r--r--arch/mips/netlogic/common/smpboot.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/netlogic/common/reset.S b/arch/mips/netlogic/common/reset.S
index b11691c629d0..0ebd50a1d618 100644
--- 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 6029d1b37f88..528c46c5a170 100644
--- 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