summaryrefslogtreecommitdiffstats
path: root/kernel/sched
diff options
context:
space:
mode:
authorPeng Liu <iwtbavbm@gmail.com>2020-06-09 17:09:36 +0200
committerPeter Zijlstra <peterz@infradead.org>2020-06-15 14:10:04 +0200
commit9b1b234bb86bcdcdb142e900d39b599185465dbb (patch)
tree9e00e99fbff3461ff957b85b343783a7b3c41e83 /kernel/sched
parentsched/fair: Fix NOHZ next idle balance (diff)
downloadlinux-9b1b234bb86bcdcdb142e900d39b599185465dbb.tar.xz
linux-9b1b234bb86bcdcdb142e900d39b599185465dbb.zip
sched: correct SD_flags returned by tl->sd_flags()
During sched domain init, we check whether non-topological SD_flags are returned by tl->sd_flags(), if found, fire a waning and correct the violation, but the code failed to correct the violation. Correct this. Fixes: 143e1e28cb40 ("sched: Rework sched_domain topology definition") Signed-off-by: Peng Liu <iwtbavbm@gmail.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org> Reviewed-by: Valentin Schneider <valentin.schneider@arm.com> Link: https://lkml.kernel.org/r/20200609150936.GA13060@iZj6chx1xj0e0buvshuecpZ
Diffstat (limited to 'kernel/sched')
-rw-r--r--kernel/sched/topology.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index ba81187bb7af..9079d865a935 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -1328,7 +1328,7 @@ sd_init(struct sched_domain_topology_level *tl,
sd_flags = (*tl->sd_flags)();
if (WARN_ONCE(sd_flags & ~TOPOLOGY_SD_FLAGS,
"wrong sd_flags in topology description\n"))
- sd_flags &= ~TOPOLOGY_SD_FLAGS;
+ sd_flags &= TOPOLOGY_SD_FLAGS;
/* Apply detected topology flags */
sd_flags |= dflags;