summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2017-06-02 23:48:51 +0200
committerRalf Baechle <ralf@linux-mips.org>2017-06-29 02:42:28 +0200
commit2f93a60c3d829da07764eafd922beb40e7317aa3 (patch)
tree7f96f1fe39fbe32deca44d49ec3c1ab26902ccae
parentMIPS: CM: Avoid per-core locking with CM3 & higher (diff)
downloadlinux-2f93a60c3d829da07764eafd922beb40e7317aa3.tar.xz
linux-2f93a60c3d829da07764eafd922beb40e7317aa3.zip
MIPS: CM: WARN on attempt to lock invalid VP, not BUG
Rather than using BUG_ON in the case of an invalid attempt to lock access to a non-zero VP on a pre-CM3 system, use WARN_ON so that we have even the slightest chance of recovery. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/16194/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/kernel/mips-cm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/mips-cm.c b/arch/mips/kernel/mips-cm.c
index 99bb74dd12ce..cb0c57f860d4 100644
--- a/arch/mips/kernel/mips-cm.c
+++ b/arch/mips/kernel/mips-cm.c
@@ -282,7 +282,7 @@ void mips_cm_lock_other(unsigned int core, unsigned int vp)
spin_lock_irqsave(this_cpu_ptr(&cm_core_lock),
*this_cpu_ptr(&cm_core_lock_flags));
} else {
- BUG_ON(vp != 0);
+ WARN_ON(vp != 0);
/*
* We only have a GCR_CL_OTHER per core in systems with