use smp_call_function_single() in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
PATCH 3/9 use smp_call_function_single() in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
From: Andrew Morton <[email protected]>
Attempting to rid us of the problematic work_on_cpu(). Just use smp_call_function_single() here.
Cc Ingo Molnar <[email protected]>
Cc Venkatesh Pallipadi <[email protected]>
Cc Len Brown <[email protected]>
Cc Zhao Yakui <[email protected]>
Cc Dave Jones <[email protected]>
Cc Thomas Gleixner <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
Signed-off-by Rusty Russell <[email protected]>
--- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c renamed from arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c~arch-x86-kernel-cpu-cpufreq-acpi-cpufreqc-avoid-using-work_on_cpu +11 -13
@@ -150,7 +150,8 @@ struct drv_cmd {u32 val; }; -static long do_drv_read (void *_cmd) +/* Called via smp_call_function_single(), on the target CPU */ +static void do_drv_read (void *_cmd) {struct drv_cmd *cmd = _cmd;u32 h;
@@ -167,10 +168,10 @@ static long do_drv_read(void *_cmd)default :break ; } -return 0 ; } -static long do_drv_write (void *_cmd) +/* Called via smp_call_function_single(), on the target CPU */ +static void do_drv_write (void *_cmd) {struct drv_cmd *cmd = _cmd;u32 lo, hi;
@@ -189,23 +190,21 @@ static long do_drv_write(void *_cmd)default :break ; } -return 0 ; }static void drv_read (struct drv_cmd *cmd) { cmd->val =0 ; -work_on_cpu (cpumask_any (cmd->mask), do_drv_read, cmd); +smp_call_function_single (cpumask_any (cmd->mask), do_drv_read, cmd,1 ); }static void drv_write (struct drv_cmd *cmd) { -unsigned int i; +unsigned int cpu; -for_each_cpu (i, cmd->mask) { -work_on_cpu (i, do_drv_write, cmd); - } +for_each_cpu (cpu, cmd->mask) +smp_call_function_single (cpu, do_drv_write, cmd,1 ); }static u32 get_cur_val (const struct cpumask *mask)
@@ -250,7 +249,8 @@ struct perf_cur { }; -static long read_measured_perf_ctrs (void *_cur) +/* Called via smp_call_function_single(), on the target CPU */ +static void read_measured_perf_ctrs (void *_cur) {struct perf_cur *cur = _cur;
@@ -259,8 +259,6 @@ static long read_measured_perf_ctrs(voidwrmsr (MSR_IA32_APERF ,0 ,0 );wrmsr (MSR_IA32_MPERF ,0 ,0 ); - -return 0 ; }/*
@@ -283,7 +281,7 @@ static unsigned int get_measured_perf(stunsigned int perf_percent;unsigned int retval; -if (!work_on_cpu (cpu, read_measured_perf_ctrs, &cur)) +if (smp_call_function_single (cpu, read_measured_perf_ctrs, &cur,1 ))return 0 ;#ifdef __i386__
_