@@ -2208,8 +2208,8 @@ static void move_task_to_local_dsq(struct task_struct *p, u64 enq_flags,
2208
2208
2209
2209
#endif /* CONFIG_SMP */
2210
2210
2211
- static void consume_local_task (struct rq * rq , struct scx_dispatch_q * dsq ,
2212
- struct task_struct * p )
2211
+ static void consume_local_task (struct task_struct * p ,
2212
+ struct scx_dispatch_q * dsq , struct rq * rq )
2213
2213
{
2214
2214
lockdep_assert_held (& dsq -> lock ); /* released on return */
2215
2215
@@ -2318,8 +2318,8 @@ static bool unlink_dsq_and_lock_src_rq(struct task_struct *p,
2318
2318
!WARN_ON_ONCE (src_rq != task_rq (p ));
2319
2319
}
2320
2320
2321
- static bool consume_remote_task (struct rq * this_rq , struct scx_dispatch_q * dsq ,
2322
- struct task_struct * p , struct rq * src_rq )
2321
+ static bool consume_remote_task (struct rq * this_rq , struct task_struct * p ,
2322
+ struct scx_dispatch_q * dsq , struct rq * src_rq )
2323
2323
{
2324
2324
raw_spin_rq_unlock (this_rq );
2325
2325
@@ -2334,7 +2334,7 @@ static bool consume_remote_task(struct rq *this_rq, struct scx_dispatch_q *dsq,
2334
2334
}
2335
2335
#else /* CONFIG_SMP */
2336
2336
static inline bool task_can_run_on_remote_rq (struct task_struct * p , struct rq * rq , bool trigger_error ) { return false; }
2337
- static inline bool consume_remote_task (struct rq * rq , struct scx_dispatch_q * dsq , struct task_struct * p , struct rq * task_rq ) { return false; }
2337
+ static inline bool consume_remote_task (struct rq * this_rq , struct task_struct * p , struct scx_dispatch_q * dsq , struct rq * task_rq ) { return false; }
2338
2338
#endif /* CONFIG_SMP */
2339
2339
2340
2340
static bool consume_dispatch_q (struct rq * rq , struct scx_dispatch_q * dsq )
@@ -2355,12 +2355,12 @@ static bool consume_dispatch_q(struct rq *rq, struct scx_dispatch_q *dsq)
2355
2355
struct rq * task_rq = task_rq (p );
2356
2356
2357
2357
if (rq == task_rq ) {
2358
- consume_local_task (rq , dsq , p );
2358
+ consume_local_task (p , dsq , rq );
2359
2359
return true;
2360
2360
}
2361
2361
2362
2362
if (task_can_run_on_remote_rq (p , rq , false)) {
2363
- if (likely (consume_remote_task (rq , dsq , p , task_rq )))
2363
+ if (likely (consume_remote_task (rq , p , dsq , task_rq )))
2364
2364
return true;
2365
2365
goto retry ;
2366
2366
}
0 commit comments