Re: [PATCH 1/6] sched/fair: Join two #ifdef CONFIG_CFS_BANDWIDTH blocks

[Shrikanth Hegde <sshegde@linux.ibm.com>]

On 12/1/25 12:16 PM, Ingo Molnar wrote:
> Join two identical #ifdef blocks:
> 
>    #ifdef CONFIG_CFS_BANDWIDTH
>    ...
>    #endif
> 
>    #ifdef CONFIG_CFS_BANDWIDTH
>    ...
>    #endif
> 

nit: I think it is CONFIG_FAIR_GROUP_SCHED here and in the subject line.

> 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>
> ---
>   kernel/sched/sched.h | 10 ++++------
>   1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
> index b419a4d98461..a29965c93832 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 */
>   };
>   

Other than above nit,

Reviewed-by: Shrikanth Hegde <sshegde@linux.ibm.com>