aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2008-05-09 03:39:44 -0400
committerJens Axboe <jens.axboe@oracle.com>2008-06-26 05:24:38 -0400
commit15c8b6c1aaaf1c4edd67e2f02e4d8e1bd1a51c0d (patch)
tree3658f893c2f89ea0be4c6cc08aa11fa54476d0f4 /arch/x86/kernel/cpu
parent8691e5a8f691cc2a4fda0651e8d307aaba0e7d68 (diff)
on_each_cpu(): kill unused 'retry' parameter
It's not even passed on to smp_call_function() anymore, since that was removed. So kill it. Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce_64.c6
-rw-r--r--arch/x86/kernel/cpu/mcheck/non-fatal.c2
-rw-r--r--arch/x86/kernel/cpu/perfctr-watchdog.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c
index e07e8c068ae0..43b7cb594912 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -363,7 +363,7 @@ static void mcheck_check_cpu(void *info)
363 363
364static void mcheck_timer(struct work_struct *work) 364static void mcheck_timer(struct work_struct *work)
365{ 365{
366 on_each_cpu(mcheck_check_cpu, NULL, 1, 1); 366 on_each_cpu(mcheck_check_cpu, NULL, 1);
367 367
368 /* 368 /*
369 * Alert userspace if needed. If we logged an MCE, reduce the 369 * Alert userspace if needed. If we logged an MCE, reduce the
@@ -612,7 +612,7 @@ static ssize_t mce_read(struct file *filp, char __user *ubuf, size_t usize,
612 * Collect entries that were still getting written before the 612 * Collect entries that were still getting written before the
613 * synchronize. 613 * synchronize.
614 */ 614 */
615 on_each_cpu(collect_tscs, cpu_tsc, 1, 1); 615 on_each_cpu(collect_tscs, cpu_tsc, 1);
616 for (i = next; i < MCE_LOG_LEN; i++) { 616 for (i = next; i < MCE_LOG_LEN; i++) {
617 if (mcelog.entry[i].finished && 617 if (mcelog.entry[i].finished &&
618 mcelog.entry[i].tsc < cpu_tsc[mcelog.entry[i].cpu]) { 618 mcelog.entry[i].tsc < cpu_tsc[mcelog.entry[i].cpu]) {
@@ -737,7 +737,7 @@ static void mce_restart(void)
737 if (next_interval) 737 if (next_interval)
738 cancel_delayed_work(&mcheck_work); 738 cancel_delayed_work(&mcheck_work);
739 /* Timer race is harmless here */ 739 /* Timer race is harmless here */
740 on_each_cpu(mce_init, NULL, 1, 1); 740 on_each_cpu(mce_init, NULL, 1);
741 next_interval = check_interval * HZ; 741 next_interval = check_interval * HZ;
742 if (next_interval) 742 if (next_interval)
743 schedule_delayed_work(&mcheck_work, 743 schedule_delayed_work(&mcheck_work,
diff --git a/arch/x86/kernel/cpu/mcheck/non-fatal.c b/arch/x86/kernel/cpu/mcheck/non-fatal.c
index 00ccb6c14ec2..cc1fccdd31e0 100644
--- a/arch/x86/kernel/cpu/mcheck/non-fatal.c
+++ b/arch/x86/kernel/cpu/mcheck/non-fatal.c
@@ -59,7 +59,7 @@ static DECLARE_DELAYED_WORK(mce_work, mce_work_fn);
59 59
60static void mce_work_fn(struct work_struct *work) 60static void mce_work_fn(struct work_struct *work)
61{ 61{
62 on_each_cpu(mce_checkregs, NULL, 1, 1); 62 on_each_cpu(mce_checkregs, NULL, 1);
63 schedule_delayed_work(&mce_work, round_jiffies_relative(MCE_RATE)); 63 schedule_delayed_work(&mce_work, round_jiffies_relative(MCE_RATE));
64} 64}
65 65
diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c
index f9ae93adffe5..58043f06d7e2 100644
--- a/arch/x86/kernel/cpu/perfctr-watchdog.c
+++ b/arch/x86/kernel/cpu/perfctr-watchdog.c
@@ -180,7 +180,7 @@ void disable_lapic_nmi_watchdog(void)
180 if (atomic_read(&nmi_active) <= 0) 180 if (atomic_read(&nmi_active) <= 0)
181 return; 181 return;
182 182
183 on_each_cpu(stop_apic_nmi_watchdog, NULL, 0, 1); 183 on_each_cpu(stop_apic_nmi_watchdog, NULL, 1);
184 wd_ops->unreserve(); 184 wd_ops->unreserve();
185 185
186 BUG_ON(atomic_read(&nmi_active) != 0); 186 BUG_ON(atomic_read(&nmi_active) != 0);
@@ -202,7 +202,7 @@ void enable_lapic_nmi_watchdog(void)
202 return; 202 return;
203 } 203 }
204 204
205 on_each_cpu(setup_apic_nmi_watchdog, NULL, 0, 1); 205 on_each_cpu(setup_apic_nmi_watchdog, NULL, 1);
206 touch_nmi_watchdog(); 206 touch_nmi_watchdog();
207} 207}
208 208