summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Senozhatsky <sergey.senozhatsky.work@gmail.com>2019-01-07 18:56:12 +0900
committerHelge Deller <deller@gmx.de>2019-02-21 20:37:11 +0100
commitc288ac978c31a68849db294826b872defedcca02 (patch)
treebfe37f0d458cd0d51cc6f389d472b114585ba26d
parentf73493eb4aecdd6edd8a749890e6e2dcfa0a7978 (diff)
downloadlinux-stable-c288ac978c31a68849db294826b872defedcca02.tar.gz
linux-stable-c288ac978c31a68849db294826b872defedcca02.tar.bz2
linux-stable-c288ac978c31a68849db294826b872defedcca02.zip
parisc: replace oops_in_progress manipulation with bust_spinlocks()
Use bust_spinlocks() function to set oops_in_progress. Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Signed-off-by: Helge Deller <deller@gmx.de>
-rw-r--r--arch/parisc/kernel/traps.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 472a818e8c17..7e1ccafadf57 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -218,7 +218,7 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err)
return;
}
- oops_in_progress = 1;
+ bust_spinlocks(1);
oops_enter();
@@ -396,7 +396,7 @@ void parisc_terminate(char *msg, struct pt_regs *regs, int code, unsigned long o
{
static DEFINE_SPINLOCK(terminate_lock);
- oops_in_progress = 1;
+ bust_spinlocks(1);
set_eiem(0);
local_irq_disable();