6 files changed, 7 insertions, 8 deletions

diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 705176b434b3..9cd818cc7008 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1881,7 +1881,7 @@ static int __cpuinit mca_cpu_callback(struct notifier_block *nfb,
         case CPU_ONLINE:
         case CPU_ONLINE_FROZEN:
                 smp_call_function_single(hotcpu, ia64_mca_cmc_vector_adjust,
-                                         NULL, 1, 0);
+                                         NULL, 0);
                 break;
         }
         return NOTIFY_OK;
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
index 9dc00f7fe10e..e5c57f413ca2 100644
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -921,7 +921,7 @@ int palinfo_handle_smp(pal_func_cpu_u_t *f, char *page)
 
 
         /* will send IPI to other CPU and wait for completion of remote call */
-        if ((ret=smp_call_function_single(f->req_cpu, palinfo_smp_call, &ptr, 0, 1))) {
+        if ((ret=smp_call_function_single(f->req_cpu, palinfo_smp_call, &ptr, 1))) {
                 printk(KERN_ERR "palinfo: remote CPU call from %d to %d on function %d: "
                        "error %d\n", smp_processor_id(), f->req_cpu, f->func_id, ret);
                 return 0;
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 7714a97b0104..9baa48255c12 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -1820,7 +1820,7 @@ pfm_syswide_cleanup_other_cpu(pfm_context_t *ctx)
         int ret;
 
         DPRINT(("calling CPU%d for cleanup\n", ctx->ctx_cpu));
-        ret = smp_call_function_single(ctx->ctx_cpu, pfm_syswide_force_stop, ctx, 0, 1);
+        ret = smp_call_function_single(ctx->ctx_cpu, pfm_syswide_force_stop, ctx, 1);
         DPRINT(("called CPU%d for cleanup ret=%d\n", ctx->ctx_cpu, ret));
 }
 #endif /* CONFIG_SMP */
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index a3a34b4eb038..fabaf08d9a69 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -286,7 +286,7 @@ void cpu_idle_wait(void)
 {
         smp_mb();
         /* kick all the CPUs so that they exit out of pm_idle */
-        smp_call_function(do_nothing, NULL, 0, 1);
+        smp_call_function(do_nothing, NULL, 1);
 }
 EXPORT_SYMBOL_GPL(cpu_idle_wait);
 
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index eaa1b6795a13..9d1d429c6c59 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -317,7 +317,7 @@ ia64_sync_itc (unsigned int master)
 
         go[MASTER] = 1;
 
-        if (smp_call_function_single(master, sync_master, NULL, 1, 0) < 0) {
+        if (smp_call_function_single(master, sync_master, NULL, 0) < 0) {
                 printk(KERN_ERR "sync_itc: failed to get attention of CPU %u!\n", master);
                 return;
         }
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c
index e77995a6e3ed..8eff8c1d40a6 100644
--- a/arch/ia64/kernel/uncached.c
+++ b/arch/ia64/kernel/uncached.c
@@ -123,8 +123,7 @@ static int uncached_add_chunk(struct uncached_pool *uc_pool, int nid)
         status = ia64_pal_prefetch_visibility(PAL_VISIBILITY_PHYSICAL);
         if (status == PAL_VISIBILITY_OK_REMOTE_NEEDED) {
                 atomic_set(&uc_pool->status, 0);
-                status = smp_call_function(uncached_ipi_visibility, uc_pool,
-                                           0, 1);
+                status = smp_call_function(uncached_ipi_visibility, uc_pool, 1);
                 if (status || atomic_read(&uc_pool->status))
                         goto failed;
         } else if (status != PAL_VISIBILITY_OK)
@@ -146,7 +145,7 @@ static int uncached_add_chunk(struct uncached_pool *uc_pool, int nid)
         if (status != PAL_STATUS_SUCCESS)
                 goto failed;
         atomic_set(&uc_pool->status, 0);
-        status = smp_call_function(uncached_ipi_mc_drain, uc_pool, 0, 1);
+        status = smp_call_function(uncached_ipi_mc_drain, uc_pool, 1);
         if (status || atomic_read(&uc_pool->status))
                 goto failed;