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()
Showing the changes to kernel (1 of 4 files). Show all
Unified · Split
| @@ -554,13 +554,15 @@ static void softlockup_start_all(void) · 553 unmodified lines | ||
| 554 | 554 | |
| 555 | 555 | int lockup_detector_online_cpu(unsigned int cpu) |
| 556 | 556 | { |
| 557 | − watchdog_enable(cpu); | |
| 557 | + if (cpumask_test_cpu(cpu, &watchdog_allowed_mask)) | |
| 558 | + watchdog_enable(cpu); | |
| 558 | 559 | return 0; |
| 559 | 560 | } |
| 560 | 561 | |
| 561 | 562 | int lockup_detector_offline_cpu(unsigned int cpu) |
| 562 | 563 | { |
| 563 | − watchdog_disable(cpu); | |
| 564 | + if (cpumask_test_cpu(cpu, &watchdog_allowed_mask)) | |
| 565 | + watchdog_disable(cpu); | |
| 564 | 566 | return 0; |
| 565 | 567 | } |
| 566 | 568 | |