Skip to content

Commit 8fca949

Browse files
Valentin SchneiderPeter Zijlstra
authored andcommitted
sched/topology: Move sd_flag_debug out of linux/sched/topology.h
Defining an array in a header imported all over the place clearly is a daft idea, that still didn't stop me from doing it. Leave a declaration of sd_flag_debug in topology.h and move its definition to sched/debug.c. Fixes: b6e862f ("sched/topology: Define and assign sched_domain flag metadata") 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-1-valentin.schneider@arm.com
1 parent c1cecf8 commit 8fca949

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

include/linux/sched/topology.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,13 @@ static const unsigned int SD_DEGENERATE_GROUPS_MASK =
3333
#undef SD_FLAG
3434

3535
#ifdef CONFIG_SCHED_DEBUG
36-
#define SD_FLAG(_name, mflags) [__##_name] = { .meta_flags = mflags, .name = #_name },
37-
static const struct {
36+
37+
struct sd_flag_debug {
3838
unsigned int meta_flags;
3939
char *name;
40-
} sd_flag_debug[] = {
41-
#include <linux/sched/sd_flags.h>
4240
};
43-
#undef SD_FLAG
41+
extern const struct sd_flag_debug sd_flag_debug[];
42+
4443
#endif
4544

4645
#ifdef CONFIG_SCHED_SMT

kernel/sched/debug.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,12 @@ set_table_entry(struct ctl_table *entry,
245245
entry->proc_handler = proc_handler;
246246
}
247247

248+
#define SD_FLAG(_name, mflags) [__##_name] = { .meta_flags = mflags, .name = #_name },
249+
const struct sd_flag_debug sd_flag_debug[] = {
250+
#include <linux/sched/sd_flags.h>
251+
};
252+
#undef SD_FLAG
253+
248254
static int sd_ctl_doflags(struct ctl_table *table, int write,
249255
void *buffer, size_t *lenp, loff_t *ppos)
250256
{

0 commit comments

Comments
 (0)