summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorK Prateek Nayak <kprateek.nayak@amd.com>2022-02-18 21:57:43 +0530
committerPeter Zijlstra <peterz@infradead.org>2022-03-08 16:08:40 +0100
commit7f434dff76215af00c26ba6449eaa4738fe9e2ab (patch)
tree0de225b4643b7b1620312de7ba6d47d57fd3f49e /kernel
parent821aecd09e5ad2f8d4c3d8195333d272b392f7d3 (diff)
downloadlinux-7f434dff76215af00c26ba6449eaa4738fe9e2ab.tar.bz2
sched/topology: Remove redundant variable and fix incorrect type in build_sched_domains
While investigating the sparse warning reported by the LKP bot [1], observed that we have a redundant variable "top" in the function build_sched_domains that was introduced in the recent commit e496132ebedd ("sched/fair: Adjust the allowed NUMA imbalance when SD_NUMA spans multiple LLCs") The existing variable "sd" suffices which allows us to remove the redundant variable "top" while annotating the other variable "top_p" with the "__rcu" annotation to silence the sparse warning. [1] https://lore.kernel.org/lkml/202202170853.9vofgC3O-lkp@intel.com/ Fixes: e496132ebedd ("sched/fair: Adjust the allowed NUMA imbalance when SD_NUMA spans multiple LLCs") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: K Prateek Nayak <kprateek.nayak@amd.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Valentin Schneider <valentin.schneider@arm.com> Link: https://lore.kernel.org/r/20220218162743.1134-1-kprateek.nayak@amd.com
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched/topology.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index 32841c6741d1..43f2899fe0ef 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -2291,7 +2291,7 @@ build_sched_domains(const struct cpumask *cpu_map, struct sched_domain_attr *att
if (!(sd->flags & SD_SHARE_PKG_RESOURCES) && child &&
(child->flags & SD_SHARE_PKG_RESOURCES)) {
- struct sched_domain *top, *top_p;
+ struct sched_domain __rcu *top_p;
unsigned int nr_llcs;
/*
@@ -2316,11 +2316,9 @@ build_sched_domains(const struct cpumask *cpu_map, struct sched_domain_attr *att
sd->imb_numa_nr = imb;
/* Set span based on the first NUMA domain. */
- top = sd;
- top_p = top->parent;
+ top_p = sd->parent;
while (top_p && !(top_p->flags & SD_NUMA)) {
- top = top->parent;
- top_p = top->parent;
+ top_p = top_p->parent;
}
imb_span = top_p ? top_p->span_weight : sd->span_weight;
} else {