i386: simplify smp_call_function_single() call sequence in msr-on-cpu
smp_call_function_single() now knows how to call the function on the current cpu. [ tglx: arch/x86 adaptation ] Cc: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Avi Kivity <avi@qumranet.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
4a40cb1ec6
commit
5f1f935ca4
|
@ -26,27 +26,18 @@ static void __rdmsr_safe_on_cpu(void *info)
|
||||||
static int _rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h, int safe)
|
static int _rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h, int safe)
|
||||||
{
|
{
|
||||||
int err = 0;
|
int err = 0;
|
||||||
preempt_disable();
|
struct msr_info rv;
|
||||||
if (smp_processor_id() == cpu)
|
|
||||||
if (safe)
|
|
||||||
err = rdmsr_safe(msr_no, l, h);
|
|
||||||
else
|
|
||||||
rdmsr(msr_no, *l, *h);
|
|
||||||
else {
|
|
||||||
struct msr_info rv;
|
|
||||||
|
|
||||||
rv.msr_no = msr_no;
|
rv.msr_no = msr_no;
|
||||||
if (safe) {
|
if (safe) {
|
||||||
smp_call_function_single(cpu, __rdmsr_safe_on_cpu,
|
smp_call_function_single(cpu, __rdmsr_safe_on_cpu, &rv, 0, 1);
|
||||||
&rv, 0, 1);
|
err = rv.err;
|
||||||
err = rv.err;
|
} else {
|
||||||
} else {
|
smp_call_function_single(cpu, __rdmsr_on_cpu, &rv, 0, 1);
|
||||||
smp_call_function_single(cpu, __rdmsr_on_cpu, &rv, 0, 1);
|
|
||||||
}
|
|
||||||
*l = rv.l;
|
|
||||||
*h = rv.h;
|
|
||||||
}
|
}
|
||||||
preempt_enable();
|
*l = rv.l;
|
||||||
|
*h = rv.h;
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -67,27 +58,18 @@ static void __wrmsr_safe_on_cpu(void *info)
|
||||||
static int _wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h, int safe)
|
static int _wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h, int safe)
|
||||||
{
|
{
|
||||||
int err = 0;
|
int err = 0;
|
||||||
preempt_disable();
|
struct msr_info rv;
|
||||||
if (smp_processor_id() == cpu)
|
|
||||||
if (safe)
|
|
||||||
err = wrmsr_safe(msr_no, l, h);
|
|
||||||
else
|
|
||||||
wrmsr(msr_no, l, h);
|
|
||||||
else {
|
|
||||||
struct msr_info rv;
|
|
||||||
|
|
||||||
rv.msr_no = msr_no;
|
rv.msr_no = msr_no;
|
||||||
rv.l = l;
|
rv.l = l;
|
||||||
rv.h = h;
|
rv.h = h;
|
||||||
if (safe) {
|
if (safe) {
|
||||||
smp_call_function_single(cpu, __wrmsr_safe_on_cpu,
|
smp_call_function_single(cpu, __wrmsr_safe_on_cpu, &rv, 0, 1);
|
||||||
&rv, 0, 1);
|
err = rv.err;
|
||||||
err = rv.err;
|
} else {
|
||||||
} else {
|
smp_call_function_single(cpu, __wrmsr_on_cpu, &rv, 0, 1);
|
||||||
smp_call_function_single(cpu, __wrmsr_on_cpu, &rv, 0, 1);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
preempt_enable();
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue