tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

generic-ipi: more merge fallout

fix more API change fallout in recently merged upstream changes.

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

Ingo Molnar f6f88e9b b3c9816b

+8 -8
+2 -2
arch/mips/oprofile/op_model_mipsxx.c
··· 313 313 if (!cpu_has_mipsmt_pertccounters) 314 314 counters = counters_total_to_per_cpu(counters); 315 315 #endif 316 - on_each_cpu(reset_counters, (void *)(long)counters, 0, 1); 316 + on_each_cpu(reset_counters, (void *)(long)counters, 1); 317 317 318 318 op_model_mipsxx_ops.num_counters = counters; 319 319 switch (current_cpu_type()) { ··· 382 382 int counters = op_model_mipsxx_ops.num_counters; 383 383 384 384 counters = counters_per_cpu_to_total(counters); 385 - on_each_cpu(reset_counters, (void *)(long)counters, 0, 1); 385 + on_each_cpu(reset_counters, (void *)(long)counters, 1); 386 386 387 387 perf_irq = save_perf_irq; 388 388 }
+1 -1
arch/ppc/kernel/smp.c
··· 152 152 153 153 void smp_send_stop(void) 154 154 { 155 - smp_call_function(stop_this_cpu, NULL, 1, 0); 155 + smp_call_function(stop_this_cpu, NULL, 0); 156 156 } 157 157 158 158 /*
+2 -2
arch/s390/kernel/time.c
··· 1432 1432 */ 1433 1433 memset(&stp_sync, 0, sizeof(stp_sync)); 1434 1434 preempt_disable(); 1435 - smp_call_function(clock_sync_cpu_start, &stp_sync, 0, 0); 1435 + smp_call_function(clock_sync_cpu_start, &stp_sync, 0); 1436 1436 local_irq_disable(); 1437 1437 enable_sync_clock(); 1438 1438 ··· 1465 1465 stp_sync.in_sync = 1; 1466 1466 1467 1467 local_irq_enable(); 1468 - smp_call_function(clock_sync_cpu_end, NULL, 0, 0); 1468 + smp_call_function(clock_sync_cpu_end, NULL, 0); 1469 1469 preempt_enable(); 1470 1470 } 1471 1471
+3 -3
drivers/watchdog/booke_wdt.c
··· 55 55 56 56 static void booke_wdt_ping(void) 57 57 { 58 - on_each_cpu(__booke_wdt_ping, NULL, 0, 0); 58 + on_each_cpu(__booke_wdt_ping, NULL, 0); 59 59 } 60 60 61 61 static void __booke_wdt_enable(void *data) ··· 131 131 spin_lock(&booke_wdt_lock); 132 132 if (booke_wdt_enabled == 0) { 133 133 booke_wdt_enabled = 1; 134 - on_each_cpu(__booke_wdt_enable, NULL, 0, 0); 134 + on_each_cpu(__booke_wdt_enable, NULL, 0); 135 135 printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled " 136 136 "(wdt_period=%d)\n", booke_wdt_period); 137 137 } ··· 177 177 if (booke_wdt_enabled == 1) { 178 178 printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled " 179 179 "(wdt_period=%d)\n", booke_wdt_period); 180 - on_each_cpu(__booke_wdt_enable, NULL, 0, 0); 180 + on_each_cpu(__booke_wdt_enable, NULL, 0); 181 181 } 182 182 spin_unlock(&booke_wdt_lock); 183 183