On Tue, Aug 25, 2020 at 02:32:16PM +0100, Valentin Schneider wrote:
> SD_DEGENERATE_GROUPS_MASK is only useful for sched/topology.c, but still
> gets defined for anyone who imports topology.h, leading to a flurry of
> unused variable warnings.
>
> Move it out of the header and place it next to the SD degeneration
> functions in sched/topology.c.
Tested-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
> Fixes: 4ee4ea443a5d ("sched/topology: Introduce SD metaflag for flags needing
> > 1 groups")
> Reported-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
> Signed-off-by: Valentin Schneider <valentin.schnei...@arm.com>
> ---
> include/linux/sched/topology.h | 7 -------
> kernel/sched/topology.c | 7 +++++++
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h
> index b9b0dab4d067..9ef7bf686a9f 100644
> --- a/include/linux/sched/topology.h
> +++ b/include/linux/sched/topology.h
> @@ -25,13 +25,6 @@ enum {
> };
> #undef SD_FLAG
>
> -/* Generate a mask of SD flags with the SDF_NEEDS_GROUPS metaflag */
> -#define SD_FLAG(name, mflags) (name * !!((mflags) & SDF_NEEDS_GROUPS)) |
> -static const unsigned int SD_DEGENERATE_GROUPS_MASK =
> -#include <linux/sched/sd_flags.h>
> -0;
> -#undef SD_FLAG
> -
> #ifdef CONFIG_SCHED_DEBUG
>
> struct sd_flag_debug {
> diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
> index 4e1260cb4b44..da3cd60e4b78 100644
> --- a/kernel/sched/topology.c
> +++ b/kernel/sched/topology.c
> @@ -154,6 +154,13 @@ static inline bool sched_debug(void)
> }
> #endif /* CONFIG_SCHED_DEBUG */
>
> +/* Generate a mask of SD flags with the SDF_NEEDS_GROUPS metaflag */
> +#define SD_FLAG(name, mflags) (name * !!((mflags) & SDF_NEEDS_GROUPS)) |
> +static const unsigned int SD_DEGENERATE_GROUPS_MASK =
> +#include <linux/sched/sd_flags.h>
> +0;
> +#undef SD_FLAG
> +
> static int sd_degenerate(struct sched_domain *sd)
> {
> if (cpumask_weight(sched_domain_span(sd)) == 1)
> --
> 2.27.0
>
--
With Best Regards,
Andy Shevchenko
