]> www.infradead.org Git - users/willy/xarray.git/commitdiff
Merge branch 'for-6.15-fixes' into for-6.16
authorTejun Heo <tj@kernel.org>
Tue, 29 Apr 2025 18:24:58 +0000 (08:24 -1000)
committerTejun Heo <tj@kernel.org>
Tue, 29 Apr 2025 18:24:58 +0000 (08:24 -1000)
To receive e38be1c7647c ("sched_ext: Fix rq lock state in hotplug ops") to
avoid conflicts with scx_sched related patches pending for for-6.16.

1  2 
kernel/sched/ext.c

index 6e530a91e94424a7bf49680f9ba86be63eab9115,4e37b40ce280cb017e38d20ae6673a85d4ba0952..59b49b3a3bbb65d5dff4f35c54765bc4b406a05e
@@@ -3491,13 -3477,13 +3491,13 @@@ static void handle_hotplug(struct rq *r
                scx_idle_update_selcpu_topology(&scx_ops);
  
        if (online && SCX_HAS_OP(cpu_online))
-               SCX_CALL_OP(SCX_KF_UNLOCKED, cpu_online, rq, cpu);
+               SCX_CALL_OP(SCX_KF_UNLOCKED, cpu_online, NULL, cpu);
        else if (!online && SCX_HAS_OP(cpu_offline))
-               SCX_CALL_OP(SCX_KF_UNLOCKED, cpu_offline, rq, cpu);
+               SCX_CALL_OP(SCX_KF_UNLOCKED, cpu_offline, NULL, cpu);
        else
 -              scx_ops_exit(SCX_ECODE_ACT_RESTART | SCX_ECODE_RSN_HOTPLUG,
 -                           "cpu %d going %s, exiting scheduler", cpu,
 -                           online ? "online" : "offline");
 +              scx_exit(SCX_ECODE_ACT_RESTART | SCX_ECODE_RSN_HOTPLUG,
 +                       "cpu %d going %s, exiting scheduler", cpu,
 +                       online ? "online" : "offline");
  }
  
  void scx_rq_activate(struct rq *rq)