diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2017-06-02 14:48:51 -0700 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2018-03-05 21:56:13 +0530 |
| commit | e9b3cd7df3517738c4123a9f7fbfc63fe490f4fd (patch) | |
| tree | a33b891d43538ad745054192177980c0019e751d /arch/mips/kernel | |
| parent | 28cf752ffcadf57a9959632edd561763862cd5fa (diff) | |
UPSTREAM: 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>
(cherry picked from commit 2f93a60c3d829da07764eafd922beb40e7317aa3)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/mips-cm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/mips-cm.c b/arch/mips/kernel/mips-cm.c index fb70ab8229d5..36bd476d0760 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 |