Merge branch 'generic-ipi' into generic-ipi-for-linus

Conflicts:

	arch/powerpc/Kconfig
	arch/s390/kernel/time.c
	arch/x86/kernel/apic_32.c
	arch/x86/kernel/cpu/perfctr-watchdog.c
	arch/x86/kernel/i8259_64.c
	arch/x86/kernel/ldt.c
	arch/x86/kernel/nmi_64.c
	arch/x86/kernel/smpboot.c
	arch/x86/xen/smp.c
	include/asm-x86/hw_irq_32.h
	include/asm-x86/hw_irq_64.h
	include/asm-x86/mach-default/irq_vectors.h
	include/asm-x86/mach-voyager/irq_vectors.h
	include/asm-x86/smp.h
	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/lib/msr-on-cpu.c b/arch/x86/lib/msr-on-cpu.c
index 57d043fa893e..d5a2b39f882b 100644
--- a/arch/x86/lib/msr-on-cpu.c
+++ b/arch/x86/lib/msr-on-cpu.c
@@ -30,10 +30,10 @@ static int _rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h, int safe)
 
         rv.msr_no = msr_no;
         if (safe) {
-                smp_call_function_single(cpu, __rdmsr_safe_on_cpu, &rv, 0, 1);
+                smp_call_function_single(cpu, __rdmsr_safe_on_cpu, &rv, 1);
                 err = rv.err;
         } else {
-                smp_call_function_single(cpu, __rdmsr_on_cpu, &rv, 0, 1);
+                smp_call_function_single(cpu, __rdmsr_on_cpu, &rv, 1);
         }
         *l = rv.l;
         *h = rv.h;
@@ -64,10 +64,10 @@ static int _wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h, int safe)
         rv.l = l;
         rv.h = h;
         if (safe) {
-                smp_call_function_single(cpu, __wrmsr_safe_on_cpu, &rv, 0, 1);
+                smp_call_function_single(cpu, __wrmsr_safe_on_cpu, &rv, 1);
                 err = rv.err;
         } else {
-                smp_call_function_single(cpu, __wrmsr_on_cpu, &rv, 0, 1);
+                smp_call_function_single(cpu, __wrmsr_on_cpu, &rv, 1);
         }
 
         return err;