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

diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 7418bebb547f..8051e9326dfc 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -707,7 +707,7 @@ static int etr_sync_clock(struct etr_aib *aib, int port)
          */
         memset(&etr_sync, 0, sizeof(etr_sync));
         preempt_disable();
-        smp_call_function(clock_sync_cpu_start, &etr_sync, 0, 0);
+        smp_call_function(clock_sync_cpu_start, &etr_sync, 0);
         local_irq_disable();
         enable_sync_clock();
 
@@ -746,7 +746,7 @@ static int etr_sync_clock(struct etr_aib *aib, int port)
                 rc = -EAGAIN;
         }
         local_irq_enable();
-        smp_call_function(clock_sync_cpu_end, NULL, 0, 0);
+        smp_call_function(clock_sync_cpu_end, NULL, 0);
         preempt_enable();
         return rc;
 }
@@ -926,7 +926,7 @@ static void etr_work_fn(struct work_struct *work)
         if (!eacr.ea) {
                 /* Both ports offline. Reset everything. */
                 eacr.dp = eacr.es = eacr.sl = 0;
-                on_each_cpu(disable_sync_clock, NULL, 0, 1);
+                on_each_cpu(disable_sync_clock, NULL, 1);
                 del_timer_sync(&etr_timer);
                 etr_update_eacr(eacr);
                 clear_bit(CLOCK_SYNC_ETR, &clock_sync_flags);