sched/fair: Make cfs_rq->throttled_csd_list available on !SMP

This makes the following patch cleaner by avoiding extra CONFIG_SMP
conditionals on the availability of rq->throttled_csd_list.

Signed-off-by: Josh Don <joshdon@google.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20230922230535.296350-1-joshdon@google.com

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 75720008fdd21196d37d21d3cbfbac100af536da..41c960eca7920ebbd028ba59b9eafda77397686a 100644 (file)
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5763,11 +5763,9 @@ static bool distribute_cfs_runtime(struct cfs_bandwidth *cfs_b)
                if (!cfs_rq_throttled(cfs_rq))
                        goto next;
 
-#ifdef CONFIG_SMP
                /* Already queued for async unthrottle */
                if (!list_empty(&cfs_rq->throttled_csd_list))
                        goto next;
-#endif
 
                /* By the above checks, this should never be true */
                SCHED_WARN_ON(cfs_rq->runtime_remaining > 0);
@@ -6134,9 +6132,7 @@ static void init_cfs_rq_runtime(struct cfs_rq *cfs_rq)
 {
        cfs_rq->runtime_enabled = 0;
        INIT_LIST_HEAD(&cfs_rq->throttled_list);
-#ifdef CONFIG_SMP
        INIT_LIST_HEAD(&cfs_rq->throttled_csd_list);
-#endif
 }
 
 void start_cfs_bandwidth(struct cfs_bandwidth *cfs_b)

diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 9260120ed2a5caeefbcf487a1ef7fe51d45c296c..96f8ab7a070219a2c7ac7f7fa8054ee88c70bd6c 100644 (file)
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -634,9 +634,7 @@ struct cfs_rq {
        int                     throttled;
        int                     throttle_count;
        struct list_head        throttled_list;
-#ifdef CONFIG_SMP
        struct list_head        throttled_csd_list;
-#endif
 #endif /* CONFIG_CFS_BANDWIDTH */
 #endif /* CONFIG_FAIR_GROUP_SCHED */
 };