Merge tag 'v4.9.230' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y

This is the 4.9.230 stable release

Change-Id: Ide9a07fe68748433a1564ca85b12b2fc4b6a152a
This commit is contained in:
Mauro (mdrjr) Ribeiro
2020-07-13 21:44:18 -03:00
34 changed files with 234 additions and 164 deletions

View File

@@ -488,6 +488,7 @@ static int kgdb_cpu_enter(struct kgdb_state *ks, struct pt_regs *regs,
arch_kgdb_ops.disable_hw_break(regs);
acquirelock:
rcu_read_lock();
/*
* Interrupts will be restored by the 'trap return' code, except when
* single stepping.
@@ -542,6 +543,7 @@ return_normal:
atomic_dec(&slaves_in_kgdb);
dbg_touch_watchdogs();
local_irq_restore(flags);
rcu_read_unlock();
return 0;
}
cpu_relax();
@@ -560,6 +562,7 @@ return_normal:
raw_spin_unlock(&dbg_master_lock);
dbg_touch_watchdogs();
local_irq_restore(flags);
rcu_read_unlock();
goto acquirelock;
}
@@ -677,6 +680,7 @@ kgdb_restore:
raw_spin_unlock(&dbg_master_lock);
dbg_touch_watchdogs();
local_irq_restore(flags);
rcu_read_unlock();
return kgdb_info[cpu].ret_state;
}