]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'for-7.1-fixes' into for-7.2
authorTejun Heo <tj@kernel.org>
Sun, 17 May 2026 20:31:10 +0000 (10:31 -1000)
committerTejun Heo <tj@kernel.org>
Sun, 17 May 2026 20:31:10 +0000 (10:31 -1000)
Pull to receive:

 39e25a210060 ("sched_ext: Drop NONE early return in scx_disable_and_exit_task()")
 b273b75b8d67 ("sched_ext: INIT_LIST_HEAD() &sch->all in scx_alloc_and_add_sched()")
 cceb874eee46 ("sched_ext: Defer sub_kset base put to scx_sched_free_rcu_work")
 6ae315d37924 ("sched_ext: Use HK_TYPE_DOMAIN_BOOT to detect isolcpus= domain isolation")
 515e3996a4c2 ("sched_ext: Fix deadlock between scx_root_disable() and concurrent forks")

to prepare for-7.2 for further sub-sched changes.

Signed-off-by: Tejun Heo <tj@kernel.org>
1  2 
kernel/sched/ext.c

index 64f8a096f133278beb651ccac299a6c8df49b8aa,547ca398f646beb35289ac6fbd8d7b4618055ad8..9c458552d14ffbe1a508c6d69afee16692443529
@@@ -7676,9 -7433,9 +7691,8 @@@ static s32 scx_enable(struct scx_enable
  {
        static struct kthread_worker *helper;
        static DEFINE_MUTEX(helper_mutex);
 -      struct scx_enable_cmd cmd;
  
-       if (!cpumask_equal(housekeeping_cpumask(HK_TYPE_DOMAIN),
-                          cpu_possible_mask)) {
+       if (housekeeping_enabled(HK_TYPE_DOMAIN_BOOT)) {
                pr_err("sched_ext: Not compatible with \"isolcpus=\" domain isolation\n");
                return -EINVAL;
        }