From: Luc Van Oostenryck <luc.vanoostenr...@gmail.com>

[ Upstream commit 99687cdbb3f6c8e32bcc7f37496e811f30460e48 ]

The percpu members of struct sd_data and s_data are declared as:

        struct ... ** __percpu member;

So their type is:

        __percpu pointer to pointer to struct ...

But looking at how they're used, their type should be:

        pointer to __percpu pointer to struct ...

and they should thus be declared as:

        struct ... * __percpu *member;

So fix the placement of '__percpu' in the definition of these
structures.

This addresses a bunch of Sparse's warnings like:

        warning: incorrect type in initializer (different address spaces)
          expected void const [noderef] <asn:3> *__vpp_verify
          got struct sched_domain **

Signed-off-by: Luc Van Oostenryck <luc.vanoostenr...@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Link: 
https://lkml.kernel.org/r/20190118144936.79158-1-luc.vanoostenr...@gmail.com
Signed-off-by: Ingo Molnar <mi...@kernel.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 include/linux/sched/topology.h | 8 ++++----
 kernel/sched/topology.c        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h
index c31d3a47a47c..57c7ed3fe465 100644
--- a/include/linux/sched/topology.h
+++ b/include/linux/sched/topology.h
@@ -176,10 +176,10 @@ typedef int (*sched_domain_flags_f)(void);
 #define SDTL_OVERLAP   0x01
 
 struct sd_data {
-       struct sched_domain **__percpu sd;
-       struct sched_domain_shared **__percpu sds;
-       struct sched_group **__percpu sg;
-       struct sched_group_capacity **__percpu sgc;
+       struct sched_domain *__percpu *sd;
+       struct sched_domain_shared *__percpu *sds;
+       struct sched_group *__percpu *sg;
+       struct sched_group_capacity *__percpu *sgc;
 };
 
 struct sched_domain_topology_level {
diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index 3f35ba1d8fde..efca2489d881 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -676,7 +676,7 @@ cpu_attach_domain(struct sched_domain *sd, struct 
root_domain *rd, int cpu)
 }
 
 struct s_data {
-       struct sched_domain ** __percpu sd;
+       struct sched_domain * __percpu *sd;
        struct root_domain      *rd;
 };
 
-- 
2.19.1

Reply via email to