diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2008-05-09 03:39:44 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2008-06-26 05:24:38 -0400 |
commit | 15c8b6c1aaaf1c4edd67e2f02e4d8e1bd1a51c0d (patch) | |
tree | 3658f893c2f89ea0be4c6cc08aa11fa54476d0f4 /arch/x86 | |
parent | 8691e5a8f691cc2a4fda0651e8d307aaba0e7d68 (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')
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce_64.c | 6 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/non-fatal.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/perfctr-watchdog.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/io_apic_32.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/io_apic_64.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/nmi_32.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/nmi_64.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/tlb_32.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/tlb_64.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/vsyscall_64.c | 2 | ||||
-rw-r--r-- | arch/x86/kvm/vmx.c | 2 | ||||
-rw-r--r-- | arch/x86/mach-voyager/voyager_smp.c | 2 | ||||
-rw-r--r-- | arch/x86/mm/pageattr.c | 4 | ||||
-rw-r--r-- | arch/x86/oprofile/nmi_int.c | 10 |
14 files changed, 24 insertions, 24 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 | ||
364 | static void mcheck_timer(struct work_struct *work) | 364 | static 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 | ||
60 | static void mce_work_fn(struct work_struct *work) | 60 | static 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 | ||
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index 4dc8600d9d20..720640ff36ca 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
@@ -1565,7 +1565,7 @@ void /*__init*/ print_local_APIC(void * dummy) | |||
1565 | 1565 | ||
1566 | void print_all_local_APICs (void) | 1566 | void print_all_local_APICs (void) |
1567 | { | 1567 | { |
1568 | on_each_cpu(print_local_APIC, NULL, 1, 1); | 1568 | on_each_cpu(print_local_APIC, NULL, 1); |
1569 | } | 1569 | } |
1570 | 1570 | ||
1571 | void /*__init*/ print_PIC(void) | 1571 | void /*__init*/ print_PIC(void) |
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c index ef1a8dfcc529..4504c7f50012 100644 --- a/arch/x86/kernel/io_apic_64.c +++ b/arch/x86/kernel/io_apic_64.c | |||
@@ -1146,7 +1146,7 @@ void __apicdebuginit print_local_APIC(void * dummy) | |||
1146 | 1146 | ||
1147 | void print_all_local_APICs (void) | 1147 | void print_all_local_APICs (void) |
1148 | { | 1148 | { |
1149 | on_each_cpu(print_local_APIC, NULL, 1, 1); | 1149 | on_each_cpu(print_local_APIC, NULL, 1); |
1150 | } | 1150 | } |
1151 | 1151 | ||
1152 | void __apicdebuginit print_PIC(void) | 1152 | void __apicdebuginit print_PIC(void) |
diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c index 5562dab0bd20..11008e0857c0 100644 --- a/arch/x86/kernel/nmi_32.c +++ b/arch/x86/kernel/nmi_32.c | |||
@@ -218,7 +218,7 @@ static void __acpi_nmi_enable(void *__unused) | |||
218 | void acpi_nmi_enable(void) | 218 | void acpi_nmi_enable(void) |
219 | { | 219 | { |
220 | if (atomic_read(&nmi_active) && nmi_watchdog == NMI_IO_APIC) | 220 | if (atomic_read(&nmi_active) && nmi_watchdog == NMI_IO_APIC) |
221 | on_each_cpu(__acpi_nmi_enable, NULL, 0, 1); | 221 | on_each_cpu(__acpi_nmi_enable, NULL, 1); |
222 | } | 222 | } |
223 | 223 | ||
224 | static void __acpi_nmi_disable(void *__unused) | 224 | static void __acpi_nmi_disable(void *__unused) |
@@ -232,7 +232,7 @@ static void __acpi_nmi_disable(void *__unused) | |||
232 | void acpi_nmi_disable(void) | 232 | void acpi_nmi_disable(void) |
233 | { | 233 | { |
234 | if (atomic_read(&nmi_active) && nmi_watchdog == NMI_IO_APIC) | 234 | if (atomic_read(&nmi_active) && nmi_watchdog == NMI_IO_APIC) |
235 | on_each_cpu(__acpi_nmi_disable, NULL, 0, 1); | 235 | on_each_cpu(__acpi_nmi_disable, NULL, 1); |
236 | } | 236 | } |
237 | 237 | ||
238 | void setup_apic_nmi_watchdog(void *unused) | 238 | void setup_apic_nmi_watchdog(void *unused) |
diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c index 2f1e4f503c9e..bbdcb17b3dfe 100644 --- a/arch/x86/kernel/nmi_64.c +++ b/arch/x86/kernel/nmi_64.c | |||
@@ -225,7 +225,7 @@ static void __acpi_nmi_enable(void *__unused) | |||
225 | void acpi_nmi_enable(void) | 225 | void acpi_nmi_enable(void) |
226 | { | 226 | { |
227 | if (atomic_read(&nmi_active) && nmi_watchdog == NMI_IO_APIC) | 227 | if (atomic_read(&nmi_active) && nmi_watchdog == NMI_IO_APIC) |
228 | on_each_cpu(__acpi_nmi_enable, NULL, 0, 1); | 228 | on_each_cpu(__acpi_nmi_enable, NULL, 1); |
229 | } | 229 | } |
230 | 230 | ||
231 | static void __acpi_nmi_disable(void *__unused) | 231 | static void __acpi_nmi_disable(void *__unused) |
@@ -239,7 +239,7 @@ static void __acpi_nmi_disable(void *__unused) | |||
239 | void acpi_nmi_disable(void) | 239 | void acpi_nmi_disable(void) |
240 | { | 240 | { |
241 | if (atomic_read(&nmi_active) && nmi_watchdog == NMI_IO_APIC) | 241 | if (atomic_read(&nmi_active) && nmi_watchdog == NMI_IO_APIC) |
242 | on_each_cpu(__acpi_nmi_disable, NULL, 0, 1); | 242 | on_each_cpu(__acpi_nmi_disable, NULL, 1); |
243 | } | 243 | } |
244 | 244 | ||
245 | void setup_apic_nmi_watchdog(void *unused) | 245 | void setup_apic_nmi_watchdog(void *unused) |
diff --git a/arch/x86/kernel/tlb_32.c b/arch/x86/kernel/tlb_32.c index 9bb2363851af..fec1ecedc9b7 100644 --- a/arch/x86/kernel/tlb_32.c +++ b/arch/x86/kernel/tlb_32.c | |||
@@ -238,6 +238,6 @@ static void do_flush_tlb_all(void *info) | |||
238 | 238 | ||
239 | void flush_tlb_all(void) | 239 | void flush_tlb_all(void) |
240 | { | 240 | { |
241 | on_each_cpu(do_flush_tlb_all, NULL, 1, 1); | 241 | on_each_cpu(do_flush_tlb_all, NULL, 1); |
242 | } | 242 | } |
243 | 243 | ||
diff --git a/arch/x86/kernel/tlb_64.c b/arch/x86/kernel/tlb_64.c index a1f07d793202..184a367516d3 100644 --- a/arch/x86/kernel/tlb_64.c +++ b/arch/x86/kernel/tlb_64.c | |||
@@ -270,5 +270,5 @@ static void do_flush_tlb_all(void *info) | |||
270 | 270 | ||
271 | void flush_tlb_all(void) | 271 | void flush_tlb_all(void) |
272 | { | 272 | { |
273 | on_each_cpu(do_flush_tlb_all, NULL, 1, 1); | 273 | on_each_cpu(do_flush_tlb_all, NULL, 1); |
274 | } | 274 | } |
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c index 0a03d57f9b3b..0dcae19ed627 100644 --- a/arch/x86/kernel/vsyscall_64.c +++ b/arch/x86/kernel/vsyscall_64.c | |||
@@ -301,7 +301,7 @@ static int __init vsyscall_init(void) | |||
301 | #ifdef CONFIG_SYSCTL | 301 | #ifdef CONFIG_SYSCTL |
302 | register_sysctl_table(kernel_root_table2); | 302 | register_sysctl_table(kernel_root_table2); |
303 | #endif | 303 | #endif |
304 | on_each_cpu(cpu_vsyscall_init, NULL, 0, 1); | 304 | on_each_cpu(cpu_vsyscall_init, NULL, 1); |
305 | hotcpu_notifier(cpu_vsyscall_notifier, 0); | 305 | hotcpu_notifier(cpu_vsyscall_notifier, 0); |
306 | return 0; | 306 | return 0; |
307 | } | 307 | } |
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 5534fe59b5fc..10ce6ee4c491 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -2968,7 +2968,7 @@ static void vmx_free_vmcs(struct kvm_vcpu *vcpu) | |||
2968 | struct vcpu_vmx *vmx = to_vmx(vcpu); | 2968 | struct vcpu_vmx *vmx = to_vmx(vcpu); |
2969 | 2969 | ||
2970 | if (vmx->vmcs) { | 2970 | if (vmx->vmcs) { |
2971 | on_each_cpu(__vcpu_clear, vmx, 0, 1); | 2971 | on_each_cpu(__vcpu_clear, vmx, 1); |
2972 | free_vmcs(vmx->vmcs); | 2972 | free_vmcs(vmx->vmcs); |
2973 | vmx->vmcs = NULL; | 2973 | vmx->vmcs = NULL; |
2974 | } | 2974 | } |
diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c index 04f596eab749..abea08459a73 100644 --- a/arch/x86/mach-voyager/voyager_smp.c +++ b/arch/x86/mach-voyager/voyager_smp.c | |||
@@ -1072,7 +1072,7 @@ static void do_flush_tlb_all(void *info) | |||
1072 | /* flush the TLB of every active CPU in the system */ | 1072 | /* flush the TLB of every active CPU in the system */ |
1073 | void flush_tlb_all(void) | 1073 | void flush_tlb_all(void) |
1074 | { | 1074 | { |
1075 | on_each_cpu(do_flush_tlb_all, 0, 1, 1); | 1075 | on_each_cpu(do_flush_tlb_all, 0, 1); |
1076 | } | 1076 | } |
1077 | 1077 | ||
1078 | /* used to set up the trampoline for other CPUs when the memory manager | 1078 | /* used to set up the trampoline for other CPUs when the memory manager |
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 60bcb5b6a37e..9b836ba9dedd 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c | |||
@@ -106,7 +106,7 @@ static void cpa_flush_all(unsigned long cache) | |||
106 | { | 106 | { |
107 | BUG_ON(irqs_disabled()); | 107 | BUG_ON(irqs_disabled()); |
108 | 108 | ||
109 | on_each_cpu(__cpa_flush_all, (void *) cache, 1, 1); | 109 | on_each_cpu(__cpa_flush_all, (void *) cache, 1); |
110 | } | 110 | } |
111 | 111 | ||
112 | static void __cpa_flush_range(void *arg) | 112 | static void __cpa_flush_range(void *arg) |
@@ -127,7 +127,7 @@ static void cpa_flush_range(unsigned long start, int numpages, int cache) | |||
127 | BUG_ON(irqs_disabled()); | 127 | BUG_ON(irqs_disabled()); |
128 | WARN_ON(PAGE_ALIGN(start) != start); | 128 | WARN_ON(PAGE_ALIGN(start) != start); |
129 | 129 | ||
130 | on_each_cpu(__cpa_flush_range, NULL, 1, 1); | 130 | on_each_cpu(__cpa_flush_range, NULL, 1); |
131 | 131 | ||
132 | if (!cache) | 132 | if (!cache) |
133 | return; | 133 | return; |
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index cc48d3fde545..3238ad32ffd8 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c | |||
@@ -218,8 +218,8 @@ static int nmi_setup(void) | |||
218 | } | 218 | } |
219 | 219 | ||
220 | } | 220 | } |
221 | on_each_cpu(nmi_save_registers, NULL, 0, 1); | 221 | on_each_cpu(nmi_save_registers, NULL, 1); |
222 | on_each_cpu(nmi_cpu_setup, NULL, 0, 1); | 222 | on_each_cpu(nmi_cpu_setup, NULL, 1); |
223 | nmi_enabled = 1; | 223 | nmi_enabled = 1; |
224 | return 0; | 224 | return 0; |
225 | } | 225 | } |
@@ -271,7 +271,7 @@ static void nmi_shutdown(void) | |||
271 | { | 271 | { |
272 | struct op_msrs *msrs = &__get_cpu_var(cpu_msrs); | 272 | struct op_msrs *msrs = &__get_cpu_var(cpu_msrs); |
273 | nmi_enabled = 0; | 273 | nmi_enabled = 0; |
274 | on_each_cpu(nmi_cpu_shutdown, NULL, 0, 1); | 274 | on_each_cpu(nmi_cpu_shutdown, NULL, 1); |
275 | unregister_die_notifier(&profile_exceptions_nb); | 275 | unregister_die_notifier(&profile_exceptions_nb); |
276 | model->shutdown(msrs); | 276 | model->shutdown(msrs); |
277 | free_msrs(); | 277 | free_msrs(); |
@@ -285,7 +285,7 @@ static void nmi_cpu_start(void *dummy) | |||
285 | 285 | ||
286 | static int nmi_start(void) | 286 | static int nmi_start(void) |
287 | { | 287 | { |
288 | on_each_cpu(nmi_cpu_start, NULL, 0, 1); | 288 | on_each_cpu(nmi_cpu_start, NULL, 1); |
289 | return 0; | 289 | return 0; |
290 | } | 290 | } |
291 | 291 | ||
@@ -297,7 +297,7 @@ static void nmi_cpu_stop(void *dummy) | |||
297 | 297 | ||
298 | static void nmi_stop(void) | 298 | static void nmi_stop(void) |
299 | { | 299 | { |
300 | on_each_cpu(nmi_cpu_stop, NULL, 0, 1); | 300 | on_each_cpu(nmi_cpu_stop, NULL, 1); |
301 | } | 301 | } |
302 | 302 | ||
303 | struct op_counter_config counter_config[OP_MAX_COUNTER]; | 303 | struct op_counter_config counter_config[OP_MAX_COUNTER]; |