diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2009-02-20 02:29:08 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-02-20 02:29:08 -0500 |
commit | b36128c830a8f5bd7d4981f5b0b69950f5928ee6 (patch) | |
tree | c1cec2c2b374b53372ab2e0592321aae9f5ba245 /kernel | |
parent | 6b588c18f8dacfa6d7957c33c5ff832096e752d3 (diff) |
alloc_percpu: change percpu_ptr to per_cpu_ptr
Impact: cleanup
There are two allocated per-cpu accessor macros with almost identical
spelling. The original and far more popular is per_cpu_ptr (44
files), so change over the other 4 files.
tj: kill percpu_ptr() and update UP too
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: mingo@redhat.com
Cc: lenb@kernel.org
Cc: cpufreq@vger.kernel.org
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched.c | 6 | ||||
-rw-r--r-- | kernel/stop_machine.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index fc17fd91ab57..9d30ac956328 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -9472,7 +9472,7 @@ cpuacct_destroy(struct cgroup_subsys *ss, struct cgroup *cgrp) | |||
9472 | 9472 | ||
9473 | static u64 cpuacct_cpuusage_read(struct cpuacct *ca, int cpu) | 9473 | static u64 cpuacct_cpuusage_read(struct cpuacct *ca, int cpu) |
9474 | { | 9474 | { |
9475 | u64 *cpuusage = percpu_ptr(ca->cpuusage, cpu); | 9475 | u64 *cpuusage = per_cpu_ptr(ca->cpuusage, cpu); |
9476 | u64 data; | 9476 | u64 data; |
9477 | 9477 | ||
9478 | #ifndef CONFIG_64BIT | 9478 | #ifndef CONFIG_64BIT |
@@ -9491,7 +9491,7 @@ static u64 cpuacct_cpuusage_read(struct cpuacct *ca, int cpu) | |||
9491 | 9491 | ||
9492 | static void cpuacct_cpuusage_write(struct cpuacct *ca, int cpu, u64 val) | 9492 | static void cpuacct_cpuusage_write(struct cpuacct *ca, int cpu, u64 val) |
9493 | { | 9493 | { |
9494 | u64 *cpuusage = percpu_ptr(ca->cpuusage, cpu); | 9494 | u64 *cpuusage = per_cpu_ptr(ca->cpuusage, cpu); |
9495 | 9495 | ||
9496 | #ifndef CONFIG_64BIT | 9496 | #ifndef CONFIG_64BIT |
9497 | /* | 9497 | /* |
@@ -9587,7 +9587,7 @@ static void cpuacct_charge(struct task_struct *tsk, u64 cputime) | |||
9587 | ca = task_ca(tsk); | 9587 | ca = task_ca(tsk); |
9588 | 9588 | ||
9589 | for (; ca; ca = ca->parent) { | 9589 | for (; ca; ca = ca->parent) { |
9590 | u64 *cpuusage = percpu_ptr(ca->cpuusage, cpu); | 9590 | u64 *cpuusage = per_cpu_ptr(ca->cpuusage, cpu); |
9591 | *cpuusage += cputime; | 9591 | *cpuusage += cputime; |
9592 | } | 9592 | } |
9593 | } | 9593 | } |
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index 0cd415ee62a2..74541ca49536 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c | |||
@@ -170,7 +170,7 @@ int __stop_machine(int (*fn)(void *), void *data, const struct cpumask *cpus) | |||
170 | * doesn't hit this CPU until we're ready. */ | 170 | * doesn't hit this CPU until we're ready. */ |
171 | get_cpu(); | 171 | get_cpu(); |
172 | for_each_online_cpu(i) { | 172 | for_each_online_cpu(i) { |
173 | sm_work = percpu_ptr(stop_machine_work, i); | 173 | sm_work = per_cpu_ptr(stop_machine_work, i); |
174 | INIT_WORK(sm_work, stop_cpu); | 174 | INIT_WORK(sm_work, stop_cpu); |
175 | queue_work_on(i, stop_machine_wq, sm_work); | 175 | queue_work_on(i, stop_machine_wq, sm_work); |
176 | } | 176 | } |