Clean up alloc_percpu: change percpu_ptr to per_cpu_ptr There are two allocated per-cpu accessor macros with almost identical spelling. The original and far more popular is per_cpu_ptr, so change over the other four files. Signed-off-by: Rusty Russell Cc: mingo@redhat.com Cc: lenb@kernel.org Cc: cpufreq@vger.kernel.org --- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 2 +- drivers/acpi/processor_perflib.c | 4 ++-- kernel/sched.c | 6 +++--- kernel/stop_machine.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff -r 7d9adda98bfe arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c --- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c Tue Nov 18 23:45:35 2008 +1030 +++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c Tue Nov 18 23:46:48 2008 +1030 @@ -606,7 +606,7 @@ if (!data) return -ENOMEM; - data->acpi_data = percpu_ptr(acpi_perf_data, cpu); + data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu); per_cpu(drv_data, cpu) = data; if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) diff -r 7d9adda98bfe drivers/acpi/processor_perflib.c --- a/drivers/acpi/processor_perflib.c Tue Nov 18 23:45:35 2008 +1030 +++ b/drivers/acpi/processor_perflib.c Tue Nov 18 23:46:48 2008 +1030 @@ -614,12 +614,12 @@ continue; } - if (!performance || !percpu_ptr(performance, i)) { + if (!performance || !per_cpu_ptr(performance, i)) { retval = -EINVAL; continue; } - pr->performance = percpu_ptr(performance, i); + pr->performance = per_cpu_ptr(performance, i); cpumask_set_cpu(i, pr->performance->shared_cpu_map); if (acpi_processor_get_psd(pr)) { retval = -EINVAL; diff -r 7d9adda98bfe kernel/sched.c --- a/kernel/sched.c Tue Nov 18 23:45:35 2008 +1030 +++ b/kernel/sched.c Tue Nov 18 23:46:48 2008 +1030 @@ -9309,7 +9309,7 @@ int i; for_each_possible_cpu(i) { - u64 *cpuusage = percpu_ptr(ca->cpuusage, i); + u64 *cpuusage = per_cpu_ptr(ca->cpuusage, i); /* * Take rq->lock to make 64-bit addition safe on 32-bit @@ -9336,7 +9336,7 @@ } for_each_possible_cpu(i) { - u64 *cpuusage = percpu_ptr(ca->cpuusage, i); + u64 *cpuusage = per_cpu_ptr(ca->cpuusage, i); spin_lock_irq(&cpu_rq(i)->lock); *cpuusage = 0; @@ -9373,7 +9373,7 @@ ca = task_ca(tsk); if (ca) { - u64 *cpuusage = percpu_ptr(ca->cpuusage, task_cpu(tsk)); + u64 *cpuusage = per_cpu_ptr(ca->cpuusage, task_cpu(tsk)); *cpuusage += cputime; } diff -r 7d9adda98bfe kernel/stop_machine.c --- a/kernel/stop_machine.c Tue Nov 18 23:45:35 2008 +1030 +++ b/kernel/stop_machine.c Tue Nov 18 23:46:48 2008 +1030 @@ -130,7 +130,7 @@ * doesn't hit this CPU until we're ready. */ get_cpu(); for_each_online_cpu(i) { - sm_work = percpu_ptr(stop_machine_work, i); + sm_work = per_cpu_ptr(stop_machine_work, i); INIT_WORK(sm_work, stop_cpu); queue_work_on(i, stop_machine_wq, sm_work); }