diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/kexec.c | 2 | ||||
-rw-r--r-- | kernel/sched.c | 4 | ||||
-rw-r--r-- | kernel/stop_machine.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index ef077fb73155..87ebe8adc474 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
@@ -41,7 +41,7 @@ | |||
41 | #include <asm/sections.h> | 41 | #include <asm/sections.h> |
42 | 42 | ||
43 | /* Per cpu memory for storing cpu states in case of system crash. */ | 43 | /* Per cpu memory for storing cpu states in case of system crash. */ |
44 | note_buf_t* crash_notes; | 44 | note_buf_t __percpu *crash_notes; |
45 | 45 | ||
46 | /* vmcoreinfo stuff */ | 46 | /* vmcoreinfo stuff */ |
47 | static unsigned char vmcoreinfo_data[VMCOREINFO_BYTES]; | 47 | static unsigned char vmcoreinfo_data[VMCOREINFO_BYTES]; |
diff --git a/kernel/sched.c b/kernel/sched.c index 3a8fb30a91b1..978edfd35a96 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -1566,7 +1566,7 @@ static unsigned long cpu_avg_load_per_task(int cpu) | |||
1566 | 1566 | ||
1567 | #ifdef CONFIG_FAIR_GROUP_SCHED | 1567 | #ifdef CONFIG_FAIR_GROUP_SCHED |
1568 | 1568 | ||
1569 | static __read_mostly unsigned long *update_shares_data; | 1569 | static __read_mostly unsigned long __percpu *update_shares_data; |
1570 | 1570 | ||
1571 | static void __set_se_shares(struct sched_entity *se, unsigned long shares); | 1571 | static void __set_se_shares(struct sched_entity *se, unsigned long shares); |
1572 | 1572 | ||
@@ -10683,7 +10683,7 @@ struct cgroup_subsys cpu_cgroup_subsys = { | |||
10683 | struct cpuacct { | 10683 | struct cpuacct { |
10684 | struct cgroup_subsys_state css; | 10684 | struct cgroup_subsys_state css; |
10685 | /* cpuusage holds pointer to a u64-type object on every cpu */ | 10685 | /* cpuusage holds pointer to a u64-type object on every cpu */ |
10686 | u64 *cpuusage; | 10686 | u64 __percpu *cpuusage; |
10687 | struct percpu_counter cpustat[CPUACCT_STAT_NSTATS]; | 10687 | struct percpu_counter cpustat[CPUACCT_STAT_NSTATS]; |
10688 | struct cpuacct *parent; | 10688 | struct cpuacct *parent; |
10689 | }; | 10689 | }; |
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index 912823e2a11b..9bb9fb1bd79c 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c | |||
@@ -45,7 +45,7 @@ static int refcount; | |||
45 | static struct workqueue_struct *stop_machine_wq; | 45 | static struct workqueue_struct *stop_machine_wq; |
46 | static struct stop_machine_data active, idle; | 46 | static struct stop_machine_data active, idle; |
47 | static const struct cpumask *active_cpus; | 47 | static const struct cpumask *active_cpus; |
48 | static void *stop_machine_work; | 48 | static void __percpu *stop_machine_work; |
49 | 49 | ||
50 | static void set_state(enum stopmachine_state newstate) | 50 | static void set_state(enum stopmachine_state newstate) |
51 | { | 51 | { |