Corrected misspelled versions of rendezvous.

The MFC will include a compat definition of smp_no_rendevous_barrier()
that calls smp_no_rendezvous_barrier().

Reviewed by:	gnn, kib
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D10313
This commit is contained in:
Patrick Kelsey 2017-04-09 02:00:03 +00:00
parent ffe63c8bf0
commit 67d955aab4
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=316648
24 changed files with 53 additions and 53 deletions

View File

@ -1733,7 +1733,7 @@ pmap_update_pde(pmap_t pmap, vm_offset_t va, pd_entry_t *pde, pd_entry_t newpde)
act.newpde = newpde;
CPU_SET(cpuid, &active);
smp_rendezvous_cpus(active,
smp_no_rendevous_barrier, pmap_update_pde_action,
smp_no_rendezvous_barrier, pmap_update_pde_action,
pmap_update_pde_teardown, &act);
} else {
pmap_update_pde_store(pmap, pde, newpde);

View File

@ -69,8 +69,8 @@ static inline void
counter_u64_zero_inline(counter_u64_t c)
{
smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu,
smp_no_rendevous_barrier, c);
smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu,
smp_no_rendezvous_barrier, c);
}
#endif

View File

@ -3322,7 +3322,7 @@ pmap_change_pte1(pmap_t pmap, pt1_entry_t *pte1p, vm_offset_t va,
act.va = va;
act.npte1 = npte1;
act.update = PCPU_GET(cpuid);
smp_rendezvous_cpus(all_cpus, smp_no_rendevous_barrier,
smp_rendezvous_cpus(all_cpus, smp_no_rendezvous_barrier,
pmap_update_pte1_action, NULL, &act);
sched_unpin();
} else {

View File

@ -70,8 +70,8 @@ static inline void
counter_u64_zero_inline(counter_u64_t c)
{
smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu,
smp_no_rendevous_barrier, c);
smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu,
smp_no_rendezvous_barrier, c);
}
#endif

View File

@ -68,8 +68,8 @@ static inline void
counter_u64_zero_inline(counter_u64_t c)
{
smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu,
smp_no_rendevous_barrier, c);
smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu,
smp_no_rendezvous_barrier, c);
}
#endif

View File

@ -134,8 +134,8 @@ dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, void *arg)
else
CPU_SETOF(cpu, &cpus);
smp_rendezvous_cpus(cpus, smp_no_rendevous_barrier, func,
smp_no_rendevous_barrier, arg);
smp_rendezvous_cpus(cpus, smp_no_rendezvous_barrier, func,
smp_no_rendezvous_barrier, arg);
}
static void

View File

@ -125,8 +125,8 @@ dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, void *arg)
else
CPU_SETOF(cpu, &cpus);
smp_rendezvous_cpus(cpus, smp_no_rendevous_barrier, func,
smp_no_rendevous_barrier, arg);
smp_rendezvous_cpus(cpus, smp_no_rendezvous_barrier, func,
smp_no_rendezvous_barrier, arg);
}
static void
@ -331,7 +331,7 @@ dtrace_gethrtime_init(void *arg)
smp_rendezvous_cpus(map, NULL,
dtrace_gethrtime_init_cpu,
smp_no_rendevous_barrier, (void *)(uintptr_t) i);
smp_no_rendezvous_barrier, (void *)(uintptr_t) i);
tsc_skew[i] = tgt_cpu_tsc - hst_cpu_tsc;
}

View File

@ -136,8 +136,8 @@ dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, void *arg)
else
CPU_SETOF(cpu, &cpus);
smp_rendezvous_cpus(cpus, smp_no_rendevous_barrier, func,
smp_no_rendevous_barrier, arg);
smp_rendezvous_cpus(cpus, smp_no_rendezvous_barrier, func,
smp_no_rendezvous_barrier, arg);
}
static void

View File

@ -127,8 +127,8 @@ dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, void *arg)
else
CPU_SETOF(cpu, &cpus);
smp_rendezvous_cpus(cpus, smp_no_rendevous_barrier, func,
smp_no_rendevous_barrier, arg);
smp_rendezvous_cpus(cpus, smp_no_rendezvous_barrier, func,
smp_no_rendezvous_barrier, arg);
}
static void
@ -333,7 +333,7 @@ dtrace_gethrtime_init(void *arg)
smp_rendezvous_cpus(map, NULL,
dtrace_gethrtime_init_cpu,
smp_no_rendevous_barrier, (void *)(uintptr_t) i);
smp_no_rendezvous_barrier, (void *)(uintptr_t) i);
tsc_skew[i] = tgt_cpu_tsc - hst_cpu_tsc;
}

View File

@ -131,8 +131,8 @@ dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, void *arg)
else
CPU_SETOF(cpu, &cpus);
smp_rendezvous_cpus(cpus, smp_no_rendevous_barrier, func,
smp_no_rendevous_barrier, arg);
smp_rendezvous_cpus(cpus, smp_no_rendezvous_barrier, func,
smp_no_rendezvous_barrier, arg);
}
static void

View File

@ -133,8 +133,8 @@ dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, void *arg)
else
CPU_SETOF(cpu, &cpus);
smp_rendezvous_cpus(cpus, smp_no_rendevous_barrier, func,
smp_no_rendevous_barrier, arg);
smp_rendezvous_cpus(cpus, smp_no_rendezvous_barrier, func,
smp_no_rendezvous_barrier, arg);
}
static void
@ -212,7 +212,7 @@ dtrace_gethrtime_init(void *arg)
smp_rendezvous_cpus(map, NULL,
dtrace_gethrtime_init_cpu,
smp_no_rendevous_barrier, (void *)(uintptr_t) i);
smp_no_rendezvous_barrier, (void *)(uintptr_t) i);
timebase_skew[i] = tgt_cpu_tsc - hst_cpu_tsc;
}

View File

@ -137,8 +137,8 @@ dtrace_xcall(processorid_t cpu, dtrace_xcall_t func, void *arg)
else
CPU_SETOF(cpu, &cpus);
smp_rendezvous_cpus(cpus, smp_no_rendevous_barrier, func,
smp_no_rendevous_barrier, arg);
smp_rendezvous_cpus(cpus, smp_no_rendezvous_barrier, func,
smp_no_rendezvous_barrier, arg);
}
static void

View File

@ -466,8 +466,8 @@ disable_idle(struct acpi_cpu_softc *sc)
* is called and executed in such a context with interrupts being re-enabled
* right before return.
*/
smp_rendezvous_cpus(cpuset, smp_no_rendevous_barrier, NULL,
smp_no_rendevous_barrier, NULL);
smp_rendezvous_cpus(cpuset, smp_no_rendezvous_barrier, NULL,
smp_no_rendezvous_barrier, NULL);
}
static void

View File

@ -1195,7 +1195,7 @@ pmap_update_pde(pmap_t pmap, vm_offset_t va, pd_entry_t *pde, pd_entry_t newpde)
act.newpde = newpde;
CPU_SET(cpuid, &active);
smp_rendezvous_cpus(active,
smp_no_rendevous_barrier, pmap == kernel_pmap ?
smp_no_rendezvous_barrier, pmap == kernel_pmap ?
pmap_update_pde_kernel : pmap_update_pde_user,
pmap_update_pde_teardown, &act);
} else {

View File

@ -148,8 +148,8 @@ counter_u64_zero_inline(counter_u64_t c)
*(uint64_t *)((char *)c + sizeof(struct pcpu) * i) = 0;
critical_exit();
} else {
smp_rendezvous(smp_no_rendevous_barrier,
counter_u64_zero_one_cpu, smp_no_rendevous_barrier, c);
smp_rendezvous(smp_no_rendezvous_barrier,
counter_u64_zero_one_cpu, smp_no_rendezvous_barrier, c);
}
}
#endif

View File

@ -556,9 +556,9 @@ _rm_wlock(struct rmlock *rm)
*/
#ifdef SMP
smp_rendezvous_cpus(readcpus,
smp_no_rendevous_barrier,
smp_no_rendezvous_barrier,
rm_cleanIPI,
smp_no_rendevous_barrier,
smp_no_rendezvous_barrier,
rm);
#else

View File

@ -451,7 +451,7 @@ smp_rendezvous_action(void)
* function. Ensure all CPUs have completed the setup
* function before moving on to the action function.
*/
if (local_setup_func != smp_no_rendevous_barrier) {
if (local_setup_func != smp_no_rendezvous_barrier) {
if (smp_rv_setup_func != NULL)
smp_rv_setup_func(smp_rv_func_arg);
atomic_add_int(&smp_rv_waiters[1], 1);
@ -462,7 +462,7 @@ smp_rendezvous_action(void)
if (local_action_func != NULL)
local_action_func(local_func_arg);
if (local_teardown_func != smp_no_rendevous_barrier) {
if (local_teardown_func != smp_no_rendezvous_barrier) {
/*
* Signal that the main action has been completed. If a
* full exit rendezvous is requested, then all CPUs will
@ -815,10 +815,10 @@ SYSINIT(cpu_mp_setvariables, SI_SUB_TUNABLES, SI_ORDER_FIRST,
#endif /* SMP */
void
smp_no_rendevous_barrier(void *dummy)
smp_no_rendezvous_barrier(void *dummy)
{
#ifdef SMP
KASSERT((!smp_started),("smp_no_rendevous called and smp is started"));
KASSERT((!smp_started),("smp_no_rendezvous called and smp is started"));
#endif
}

View File

@ -72,8 +72,8 @@ static inline void
counter_u64_zero_inline(counter_u64_t c)
{
smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu,
smp_no_rendevous_barrier, c);
smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu,
smp_no_rendezvous_barrier, c);
}
#endif

View File

@ -72,8 +72,8 @@ static inline void
counter_u64_zero_inline(counter_u64_t c)
{
smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu,
smp_no_rendevous_barrier, c);
smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu,
smp_no_rendezvous_barrier, c);
}
#endif
@ -138,8 +138,8 @@ static inline void
counter_u64_zero_inline(counter_u64_t c)
{
smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu,
smp_no_rendevous_barrier, c);
smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu,
smp_no_rendezvous_barrier, c);
}
#endif

View File

@ -528,8 +528,8 @@ openfirmware(void *args)
#ifdef SMP
rv_args.args = args;
rv_args.in_progress = 1;
smp_rendezvous(smp_no_rendevous_barrier, ofw_rendezvous_dispatch,
smp_no_rendevous_barrier, &rv_args);
smp_rendezvous(smp_no_rendezvous_barrier, ofw_rendezvous_dispatch,
smp_no_rendezvous_barrier, &rv_args);
result = rv_args.retval;
#else
result = openfirmware_core(args);

View File

@ -71,8 +71,8 @@ static inline void
counter_u64_zero_inline(counter_u64_t c)
{
smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu,
smp_no_rendevous_barrier, c);
smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu,
smp_no_rendezvous_barrier, c);
}
#endif

View File

@ -71,8 +71,8 @@ static inline void
counter_u64_zero_inline(counter_u64_t c)
{
smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu,
smp_no_rendevous_barrier, c);
smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu,
smp_no_rendezvous_barrier, c);
}
#endif

View File

@ -240,7 +240,7 @@ extern struct mtx smp_ipi_mtx;
int quiesce_all_cpus(const char *, int);
int quiesce_cpus(cpuset_t, const char *, int);
void smp_no_rendevous_barrier(void *);
void smp_no_rendezvous_barrier(void *);
void smp_rendezvous(void (*)(void *),
void (*)(void *),
void (*)(void *),

View File

@ -443,12 +443,12 @@ test_tsc(void)
for (i = 0, tsc = data; i < N; i++, tsc += size)
smp_rendezvous(tsc_read_0, tsc_read_1, tsc_read_2, tsc);
smp_tsc = 1; /* XXX */
smp_rendezvous(smp_no_rendevous_barrier, comp_smp_tsc,
smp_no_rendevous_barrier, data);
smp_rendezvous(smp_no_rendezvous_barrier, comp_smp_tsc,
smp_no_rendezvous_barrier, data);
if (!smp_tsc && adj < smp_tsc_adjust) {
adj++;
smp_rendezvous(smp_no_rendevous_barrier, adj_smp_tsc,
smp_no_rendevous_barrier, data);
smp_rendezvous(smp_no_rendezvous_barrier, adj_smp_tsc,
smp_no_rendezvous_barrier, data);
goto retry;
}
free(data, M_TEMP);