diff options
| author | Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2019-01-18 15:56:48 +0100 |
|---|---|---|
| committer | Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2019-01-18 15:56:48 +0100 |
| commit | 204ff7130a388cdf6e67a22bb1a35a6da2428561 (patch) | |
| tree | 699e3cc88b3bd40aec8ec2874fa3c0e37678ea94 | |
| parent | 3982a23c945a7daa57f113e912dfacb01ae20f2f (diff) | |
| parent | 2a6c730f5403787945f593ad419fe2f55122fa0b (diff) | |
| download | linux-top.tar.gz | |
Merge branch 'fix-percpu-ptr-ptr' into toptop
| -rw-r--r-- | include/linux/relay.h | 2 | ||||
| -rw-r--r-- | include/linux/sched/topology.h | 8 | ||||
| -rw-r--r-- | kernel/sched/topology.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/relay.h b/include/linux/relay.h index e1bdf01a86e2a..c759f96e39c18 100644 --- a/include/linux/relay.h +++ b/include/linux/relay.h @@ -66,7 +66,7 @@ struct rchan struct kref kref; /* channel refcount */ void *private_data; /* for user-defined data */ size_t last_toobig; /* tried to log event > subbuf size */ - struct rchan_buf ** __percpu buf; /* per-cpu channel buffers */ + struct rchan_buf * __percpu *buf; /* per-cpu channel buffers */ int is_global; /* One global buffer ? */ struct list_head list; /* for channel list */ struct dentry *parent; /* parent dentry passed to open */ diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h index c31d3a47a47cc..57c7ed3fe4659 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 3f35ba1d8fde5..efca2489d881c 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; }; |