sched/topology: Move SD_DEGENERATE_GROUPS_MASK out of linux/sched/topology.h (4fc472f1) · Commits · 戴 / test

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. Fixes: ("sched/topology: Introduce SD metaflag for flags needing > 1 groups") Reported-by:

Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by:

Valentin Schneider <valentin.schneider@arm.com> Signed-off-by:

Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20200825133216.9163-2-valentin.schneider@arm.com

include/linux/sched/topology.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -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 {

kernel/sched/topology.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -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)

Admin message