Merge branch 'linus' into cpus4096

Conflicts:

	arch/x86/xen/smp.c
	kernel/sched_rt.c
	net/iucv/iucv.c

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

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index b40df7d2cf44..54759f1669d3 100644
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -313,7 +313,7 @@ static int __init mipsxx_init(void)
         if (!cpu_has_mipsmt_pertccounters)
                 counters = counters_total_to_per_cpu(counters);
 #endif
-        on_each_cpu(reset_counters, (void *)(long)counters, 0, 1);
+        on_each_cpu(reset_counters, (void *)(long)counters, 1);
 
         op_model_mipsxx_ops.num_counters = counters;
         switch (current_cpu_type()) {
@@ -382,7 +382,7 @@ static void mipsxx_exit(void)
         int counters = op_model_mipsxx_ops.num_counters;
 
         counters = counters_per_cpu_to_total(counters);
-        on_each_cpu(reset_counters, (void *)(long)counters, 0, 1);
+        on_each_cpu(reset_counters, (void *)(long)counters, 1);
 
         perf_irq = save_perf_irq;
 }