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, 2 insertions, 2 deletions

diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 9cb3d92447a3..a7f8979fb925 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -203,7 +203,7 @@ __appldata_vtimer_setup(int cmd)
                         per_cpu(appldata_timer, i).expires = per_cpu_interval;
                         smp_call_function_single(i, add_virt_timer_periodic,
                                                  &per_cpu(appldata_timer, i),
-                                                 0, 1);
+                                                 1);
                 }
                 appldata_timer_active = 1;
                 break;
@@ -228,7 +228,7 @@ __appldata_vtimer_setup(int cmd)
                         args.timer = &per_cpu(appldata_timer, i);
                         args.expires = per_cpu_interval;
                         smp_call_function_single(i, __appldata_mod_vtimer_wrap,
-                                                 &args, 0, 1);
+                                                 &args, 1);
                 }
         }
 }