| Message ID | 1397820846-32603-1-git-send-email-vincent.guittot@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Fri, Apr 18, 2014 at 01:34:06PM +0200, Vincent Guittot wrote: > fix missing change from int to pointer function for numa flags > > Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> Thanks, folded it into the original patch. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
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)
fix missing change from int to pointer function for numa flags Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> --- include/linux/sched.h | 7 +++++++ kernel/sched/core.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)