Clean up alloc_percpu: change percpu_ptr to per_cpu_ptr
PATCH 3/3 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 <[email protected]>
--- 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(-)
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +1 -1
@@ -581,7 +581,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 ))
drivers/acpi/processor_perflib.c +2 -2
@@ -611,12 +611,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);cpu_set (i, pr->performance->shared_cpu_map);if (acpi_processor_get_psd (pr)) { retval = -EINVAL ;
kernel/sched.c +3 -3
@@ -9306,7 +9306,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
@@ -9333,7 +9333,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 ;
@@ -9370,7 +9370,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; }
kernel/stop_machine.c +1 -1
@@ -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); }