diff options
-rw-r--r-- | arch/mips/oprofile/op_model_mipsxx.c | 4 | ||||
-rw-r--r-- | arch/ppc/kernel/smp.c | 2 | ||||
-rw-r--r-- | arch/s390/kernel/time.c | 4 | ||||
-rw-r--r-- | drivers/watchdog/booke_wdt.c | 6 |
4 files changed, 8 insertions, 8 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) | |||
313 | if (!cpu_has_mipsmt_pertccounters) | 313 | if (!cpu_has_mipsmt_pertccounters) |
314 | counters = counters_total_to_per_cpu(counters); | 314 | counters = counters_total_to_per_cpu(counters); |
315 | #endif | 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 | op_model_mipsxx_ops.num_counters = counters; | 318 | op_model_mipsxx_ops.num_counters = counters; |
319 | switch (current_cpu_type()) { | 319 | switch (current_cpu_type()) { |
@@ -382,7 +382,7 @@ static void mipsxx_exit(void) | |||
382 | int counters = op_model_mipsxx_ops.num_counters; | 382 | int counters = op_model_mipsxx_ops.num_counters; |
383 | 383 | ||
384 | counters = counters_per_cpu_to_total(counters); | 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 | perf_irq = save_perf_irq; | 387 | perf_irq = save_perf_irq; |
388 | } | 388 | } |
diff --git a/arch/ppc/kernel/smp.c b/arch/ppc/kernel/smp.c index 055998575cb4..bcab0d210e30 100644 --- a/arch/ppc/kernel/smp.c +++ b/arch/ppc/kernel/smp.c | |||
@@ -152,7 +152,7 @@ static void stop_this_cpu(void *dummy) | |||
152 | 152 | ||
153 | void smp_send_stop(void) | 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 | /* |
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index 8051e9326dfc..f2cede3947b2 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c | |||
@@ -1432,7 +1432,7 @@ static void stp_work_fn(struct work_struct *work) | |||
1432 | */ | 1432 | */ |
1433 | memset(&stp_sync, 0, sizeof(stp_sync)); | 1433 | memset(&stp_sync, 0, sizeof(stp_sync)); |
1434 | preempt_disable(); | 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 | local_irq_disable(); | 1436 | local_irq_disable(); |
1437 | enable_sync_clock(); | 1437 | enable_sync_clock(); |
1438 | 1438 | ||
@@ -1465,7 +1465,7 @@ static void stp_work_fn(struct work_struct *work) | |||
1465 | stp_sync.in_sync = 1; | 1465 | stp_sync.in_sync = 1; |
1466 | 1466 | ||
1467 | local_irq_enable(); | 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 | preempt_enable(); | 1469 | preempt_enable(); |
1470 | } | 1470 | } |
1471 | 1471 | ||
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index c1ba0db48501..770824458d45 100644 --- a/drivers/watchdog/booke_wdt.c +++ b/drivers/watchdog/booke_wdt.c | |||
@@ -55,7 +55,7 @@ static void __booke_wdt_ping(void *data) | |||
55 | 55 | ||
56 | static void booke_wdt_ping(void) | 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 | static void __booke_wdt_enable(void *data) | 61 | static void __booke_wdt_enable(void *data) |
@@ -131,7 +131,7 @@ static int booke_wdt_open(struct inode *inode, struct file *file) | |||
131 | spin_lock(&booke_wdt_lock); | 131 | spin_lock(&booke_wdt_lock); |
132 | if (booke_wdt_enabled == 0) { | 132 | if (booke_wdt_enabled == 0) { |
133 | booke_wdt_enabled = 1; | 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 | printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled " | 135 | printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled " |
136 | "(wdt_period=%d)\n", booke_wdt_period); | 136 | "(wdt_period=%d)\n", booke_wdt_period); |
137 | } | 137 | } |
@@ -177,7 +177,7 @@ static int __init booke_wdt_init(void) | |||
177 | if (booke_wdt_enabled == 1) { | 177 | if (booke_wdt_enabled == 1) { |
178 | printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled " | 178 | printk(KERN_INFO "PowerPC Book-E Watchdog Timer Enabled " |
179 | "(wdt_period=%d)\n", booke_wdt_period); | 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 | spin_unlock(&booke_wdt_lock); | 182 | spin_unlock(&booke_wdt_lock); |
183 | 183 | ||