diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-11-26 11:31:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-12-15 07:52:44 +0100 |
| commit | 2b8c3d3dc9b1ee323e2982945088e3f5eebdf3dd (patch) | |
| tree | 74ab2fd8acba6d3c118adf6718f98096ea9c71d0 | |
| parent | 47efe2ddccb1f285a02bfcf1e079f49bf7a9ccb3 (diff) | |
| download | linux-2b8c3d3dc9b1ee323e2982945088e3f5eebdf3dd.tar.gz linux-2b8c3d3dc9b1ee323e2982945088e3f5eebdf3dd.zip | |
sched/fair: Join two #ifdef CONFIG_FAIR_GROUP_SCHED blocks
Join two identical #ifdef blocks:
#ifdef CONFIG_FAIR_GROUP_SCHED
...
#endif
#ifdef CONFIG_FAIR_GROUP_SCHED
...
#endif
Also mark nested #ifdef blocks in the usual fashion, to make
it more apparent where in a nested hierarchy of #ifdefs we
are at a glance.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Shrikanth Hegde <sshegde@linux.ibm.com>
Link: https://patch.msgid.link/20251201064647.1851919-2-mingo@kernel.org
| -rw-r--r-- | kernel/sched/sched.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index a40582d5b288..2173e3d4fa0d 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -726,9 +726,7 @@ struct cfs_rq { unsigned long h_load; u64 last_h_load_update; struct sched_entity *h_load_next; -#endif /* CONFIG_FAIR_GROUP_SCHED */ -#ifdef CONFIG_FAIR_GROUP_SCHED struct rq *rq; /* CPU runqueue to which this cfs_rq is attached */ /* @@ -746,14 +744,14 @@ struct cfs_rq { /* Locally cached copy of our task_group's idle value */ int idle; -#ifdef CONFIG_CFS_BANDWIDTH +# ifdef CONFIG_CFS_BANDWIDTH int runtime_enabled; s64 runtime_remaining; u64 throttled_pelt_idle; -#ifndef CONFIG_64BIT +# ifndef CONFIG_64BIT u64 throttled_pelt_idle_copy; -#endif +# endif u64 throttled_clock; u64 throttled_clock_pelt; u64 throttled_clock_pelt_time; @@ -765,7 +763,7 @@ struct cfs_rq { struct list_head throttled_list; struct list_head throttled_csd_list; struct list_head throttled_limbo_list; -#endif /* CONFIG_CFS_BANDWIDTH */ +# endif /* CONFIG_CFS_BANDWIDTH */ #endif /* CONFIG_FAIR_GROUP_SCHED */ }; |