From mboxrd@z Thu Jan 1 00:00:00 1970 From: vincent.guittot@linaro.org (Vincent Guittot) Date: Fri, 18 Apr 2014 13:34:06 +0200 Subject: [PATCH] fix: sched: rework of sched_domain topology definition In-Reply-To: <20140418105601.GU11182@twins.programming.kicks-ass.net> References: <20140418105601.GU11182@twins.programming.kicks-ass.net> Message-ID: <1397820846-32603-1-git-send-email-vincent.guittot@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org fix missing change from int to pointer function for numa flags Signed-off-by: Vincent Guittot --- include/linux/sched.h | 7 +++++++ kernel/sched/core.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 18464cb..d2b981c 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -887,6 +887,13 @@ static inline const int cpu_core_flags(void) } #endif +#ifdef CONFIG_NUMA +static inline const int cpu_numa_flags(void) +{ + return SD_NUMA; +} +#endif + struct sched_domain_attr { int relax_domain_level; }; diff --git a/kernel/sched/core.c b/kernel/sched/core.c index a30b0b4..24d0831 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6235,7 +6235,7 @@ static void sched_init_numa(void) for (j = 0; j < level; i++, j++) { tl[i] = (struct sched_domain_topology_level){ .mask = sd_numa_mask, - .sd_flags = SD_NUMA, + .sd_flags = cpu_numa_flags, .flags = SDTL_OVERLAP, .numa_level = j, SD_INIT_NAME(NUMA) -- 1.9.1