Pull scheduler fixes from Borislav Petkov: - Avoid touching ~100 config files in order to be able to select the preemption model - clear cluster CPU masks too, on the CPU unplug path - prevent use-after-free in cfs - Prevent a race condition when updating CPU cache domains - Factor out common shared part of smp_prepare_cpus() into a common helper which can be called by both baremetal and Xen, in order to fix a booting of Xen PV guests * tag 'sched_urgent_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: preempt: Restore preemption model selection configs arch_topology: Fix missing clear cluster_cpumask in remove_cpu_topology() sched/fair: Prevent dead task groups from regaining cfs_rq's sched/core: Mitigate race cpus_share_cache()/update_top_cache_domain() x86/smp: Factor out parts of native_smp_prepare_cpus()
Showing the changes to include (2 of 13 files). Show all
Unified · Split
| @@ -85,7 +85,7 @@ · 84 unmodified lines | ||
| 85 | 85 | struct completion; |
| 86 | 86 | struct user; |
| 87 | 87 | |
| 88 | −#ifdef CONFIG_PREEMPT_VOLUNTARY | |
| 88 | +#ifdef CONFIG_PREEMPT_VOLUNTARY_BUILD | |
| 89 | 89 | |
| 90 | 90 | extern int __cond_resched(void); |
| 91 | 91 | # define might_resched() __cond_resched() |
| @@ -15,7 +15,7 @@ · 14 unmodified lines | ||
| 15 | 15 | #else |
| 16 | 16 | #define MODULE_VERMAGIC_SMP "" |
| 17 | 17 | #endif |
| 18 | −#ifdef CONFIG_PREEMPT | |
| 18 | +#ifdef CONFIG_PREEMPT_BUILD | |
| 19 | 19 | #define MODULE_VERMAGIC_PREEMPT "preempt " |
| 20 | 20 | #elif defined(CONFIG_PREEMPT_RT) |
| 21 | 21 | #define MODULE_VERMAGIC_PREEMPT "preempt_rt " |