Skip to content

Commit 4fc472f

Browse files
Valentin SchneiderPeter Zijlstra
authored andcommitted
sched/topology: Move SD_DEGENERATE_GROUPS_MASK out of linux/sched/topology.h
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: 4ee4ea4 ("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
1 parent 8fca949 commit 4fc472f

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

include/linux/sched/topology.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@ enum {
2525
};
2626
#undef SD_FLAG
2727

28-
/* Generate a mask of SD flags with the SDF_NEEDS_GROUPS metaflag */
29-
#define SD_FLAG(name, mflags) (name * !!((mflags) & SDF_NEEDS_GROUPS)) |
30-
static const unsigned int SD_DEGENERATE_GROUPS_MASK =
31-
#include <linux/sched/sd_flags.h>
32-
0;
33-
#undef SD_FLAG
34-
3528
#ifdef CONFIG_SCHED_DEBUG
3629

3730
struct sd_flag_debug {

kernel/sched/topology.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,13 @@ static inline bool sched_debug(void)
154154
}
155155
#endif /* CONFIG_SCHED_DEBUG */
156156

157+
/* Generate a mask of SD flags with the SDF_NEEDS_GROUPS metaflag */
158+
#define SD_FLAG(name, mflags) (name * !!((mflags) & SDF_NEEDS_GROUPS)) |
159+
static const unsigned int SD_DEGENERATE_GROUPS_MASK =
160+
#include <linux/sched/sd_flags.h>
161+
0;
162+
#undef SD_FLAG
163+
157164
static int sd_degenerate(struct sched_domain *sd)
158165
{
159166
if (cpumask_weight(sched_domain_span(sd)) == 1)

0 commit comments

Comments
 (0)