History

Merge tag 'sched_urgent_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

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()

Linus Torvalds committed 5 years ago

Commit fc661f22 parents f7018be a8b769113 files · +96 −59Browse files

Showing the changes to include (2 of 13 files). Show all

Unified · Split

2 files
  1. include/linux/kernel.h +1 −1
  2. include/linux/vermagic.h +1 −1
include/linux/kernel.h+1−1
@@ -85,7 +85,7 @@ · 84 unmodified lines
8585 struct completion;
8686 struct user;
8787
88−#ifdef CONFIG_PREEMPT_VOLUNTARY
88+#ifdef CONFIG_PREEMPT_VOLUNTARY_BUILD
8989
9090 extern int __cond_resched(void);
9191 # define might_resched() __cond_resched()
include/linux/vermagic.h+1−1
@@ -15,7 +15,7 @@ · 14 unmodified lines
1515 #else
1616 #define MODULE_VERMAGIC_SMP ""
1717 #endif
18−#ifdef CONFIG_PREEMPT
18+#ifdef CONFIG_PREEMPT_BUILD
1919 #define MODULE_VERMAGIC_PREEMPT "preempt "
2020 #elif defined(CONFIG_PREEMPT_RT)
2121 #define MODULE_VERMAGIC_PREEMPT "preempt_rt "

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t