Merge tag 'cgroup-for-6.2-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / kernel / sched / deadline.c

diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index 9ae8f41..0d97d54 100644 (file)
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -2485,8 +2485,7 @@ static void task_woken_dl(struct rq *rq, struct task_struct *p)
 }
 
 static void set_cpus_allowed_dl(struct task_struct *p,
-                               const struct cpumask *new_mask,
-                               u32 flags)
+                               struct affinity_context *ctx)
 {
        struct root_domain *src_rd;
        struct rq *rq;
@@ -2501,7 +2500,7 @@ static void set_cpus_allowed_dl(struct task_struct *p,
         * update. We already made space for us in the destination
         * domain (see cpuset_can_attach()).
         */
-       if (!cpumask_intersects(src_rd->span, new_mask)) {
+       if (!cpumask_intersects(src_rd->span, ctx->new_mask)) {
                struct dl_bw *src_dl_b;
 
                src_dl_b = dl_bw_of(cpu_of(rq));
@@ -2515,7 +2514,7 @@ static void set_cpus_allowed_dl(struct task_struct *p,
                raw_spin_unlock(&src_dl_b->lock);
        }
 
-       set_cpus_allowed_common(p, new_mask, flags);
+       set_cpus_allowed_common(p, ctx);
 }
 
 /* Assumes rq->lock is held */