3 files changed, 10 insertions, 14 deletions

diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index ad40729bec3d..837a3b3e7759 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -209,7 +209,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;
                 P_INFO("Monitoring timer started.\n");
@@ -236,7 +236,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);
                 }
         }
 }
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 5d4fa4b1c74c..276b105fb2a4 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -109,7 +109,7 @@ static void do_call_function(void)
 }
 
 static void __smp_call_function_map(void (*func) (void *info), void *info,
-                                    int nonatomic, int wait, cpumask_t map)
+                                    int wait, cpumask_t map)
 {
         struct call_data_struct data;
         int cpu, local = 0;
@@ -162,7 +162,6 @@ out:
  * smp_call_function:
  * @func: the function to run; this must be fast and non-blocking
  * @info: an arbitrary pointer to pass to the function
- * @nonatomic: unused
  * @wait: if true, wait (atomically) until function has completed on other CPUs
  *
  * Run a function on all other CPUs.
@@ -170,15 +169,14 @@ out:
  * You must not call this function with disabled interrupts, from a
  * hardware interrupt handler or from a bottom half.
  */
-int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
-                      int wait)
+int smp_call_function(void (*func) (void *info), void *info, int wait)
 {
         cpumask_t map;
 
         spin_lock(&call_lock);
         map = cpu_online_map;
         cpu_clear(smp_processor_id(), map);
-        __smp_call_function_map(func, info, nonatomic, wait, map);
+        __smp_call_function_map(func, info, wait, map);
         spin_unlock(&call_lock);
         return 0;
 }
@@ -189,7 +187,6 @@ EXPORT_SYMBOL(smp_call_function);
  * @cpu: the CPU where func should run
  * @func: the function to run; this must be fast and non-blocking
  * @info: an arbitrary pointer to pass to the function
- * @nonatomic: unused
  * @wait: if true, wait (atomically) until function has completed on other CPUs
  *
  * Run a function on one processor.
@@ -198,11 +195,10 @@ EXPORT_SYMBOL(smp_call_function);
  * hardware interrupt handler or from a bottom half.
  */
 int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
-                             int nonatomic, int wait)
+                             int wait)
 {
         spin_lock(&call_lock);
-        __smp_call_function_map(func, info, nonatomic, wait,
-                                cpumask_of_cpu(cpu));
+        __smp_call_function_map(func, info, wait, cpumask_of_cpu(cpu));
         spin_unlock(&call_lock);
         return 0;
 }
@@ -228,7 +224,7 @@ int smp_call_function_mask(cpumask_t mask, void (*func)(void *), void *info,
 {
         spin_lock(&call_lock);
         cpu_clear(smp_processor_id(), mask);
-        __smp_call_function_map(func, info, 0, wait, mask);
+        __smp_call_function_map(func, info, wait, mask);
         spin_unlock(&call_lock);
         return 0;
 }
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 7aec676fefd5..bf7bf2c2236a 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -690,7 +690,7 @@ static int etr_sync_clock(struct etr_aib *aib, int port)
          */
         memset(&etr_sync, 0, sizeof(etr_sync));
         preempt_disable();
-        smp_call_function(etr_sync_cpu_start, NULL, 0, 0);
+        smp_call_function(etr_sync_cpu_start, NULL, 0);
         local_irq_disable();
         etr_enable_sync_clock();
 
@@ -729,7 +729,7 @@ static int etr_sync_clock(struct etr_aib *aib, int port)
                 rc = -EAGAIN;
         }
         local_irq_enable();
-        smp_call_function(etr_sync_cpu_end,NULL,0,0);
+        smp_call_function(etr_sync_cpu_end,NULL,0);
         preempt_enable();
         return rc;
 }