mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-10 06:09:23 -04:00
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Thomas Gleixner:
"A small set of core updates:
- Make the watchdog respect the selected CPU mask again. That was
broken by the rework of the watchdog thread management and caused
inconsistent state and NMI watchdog being unstoppable.
- Ensure that the objtool build can find the libelf location.
- Remove dead kcore stub code"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
watchdog: Respect watchdog cpumask on CPU hotplug
objtool: Query pkg-config for libelf location
proc/kcore: Remove unused kclist_add_remap()
This commit is contained in:
commit
f78b5be2a5
4 changed files with 12 additions and 16 deletions
|
|
@ -554,13 +554,15 @@ static void softlockup_start_all(void)
|
|||
|
||||
int lockup_detector_online_cpu(unsigned int cpu)
|
||||
{
|
||||
watchdog_enable(cpu);
|
||||
if (cpumask_test_cpu(cpu, &watchdog_allowed_mask))
|
||||
watchdog_enable(cpu);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int lockup_detector_offline_cpu(unsigned int cpu)
|
||||
{
|
||||
watchdog_disable(cpu);
|
||||
if (cpumask_test_cpu(cpu, &watchdog_allowed_mask))
|
||||
watchdog_disable(cpu);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue