summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.com>2018-08-14 13:36:15 +0200
committerPetr Mladek <pmladek@suse.com>2018-08-14 13:36:15 +0200
commit9f68cb579115faa211ae067b4628cf11162783fb (patch)
tree051146dd180af1b8a368d1a53b78c78920e15f64 /lib
parent554ec508653688c21d9b8024af73a1ffaa0164b9 (diff)
parent03fc7f9c99c1e7ae2925d459e8487f1a6f199f79 (diff)
downloadlinux-9f68cb579115faa211ae067b4628cf11162783fb.tar.bz2
Merge branch 'for-4.19-nmi' into for-linus
Diffstat (limited to 'lib')
-rw-r--r--lib/nmi_backtrace.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/nmi_backtrace.c b/lib/nmi_backtrace.c
index 61a6b5aab07e..15ca78e1c7d4 100644
--- a/lib/nmi_backtrace.c
+++ b/lib/nmi_backtrace.c
@@ -87,11 +87,9 @@ void nmi_trigger_cpumask_backtrace(const cpumask_t *mask,
bool nmi_cpu_backtrace(struct pt_regs *regs)
{
- static arch_spinlock_t lock = __ARCH_SPIN_LOCK_UNLOCKED;
int cpu = smp_processor_id();
if (cpumask_test_cpu(cpu, to_cpumask(backtrace_mask))) {
- arch_spin_lock(&lock);
if (regs && cpu_in_idle(instruction_pointer(regs))) {
pr_warn("NMI backtrace for cpu %d skipped: idling at %pS\n",
cpu, (void *)instruction_pointer(regs));
@@ -102,7 +100,6 @@ bool nmi_cpu_backtrace(struct pt_regs *regs)
else
dump_stack();
}
- arch_spin_unlock(&lock);
cpumask_clear_cpu(cpu, to_cpumask(backtrace_mask));
return true;
}