mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-10 14:02:43 +00:00
__func__ is a const char *, not a "string" that can be concatenated.
This commit is contained in:
parent
90f9252584
commit
6d4a5aee06
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=92674
@ -106,7 +106,7 @@ ia64_ap_startup(void)
|
|||||||
|
|
||||||
mtx_lock_spin(&sched_lock);
|
mtx_lock_spin(&sched_lock);
|
||||||
cpu_throw();
|
cpu_throw();
|
||||||
panic(__func__ ": cpu_throw() returned");
|
panic("ia64_ap_startup: cpu_throw() returned");
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
@ -140,13 +140,13 @@ cpu_mp_add(uint acpiid, uint apicid, uint apiceid)
|
|||||||
}
|
}
|
||||||
|
|
||||||
KASSERT((all_cpus & (1UL << acpiid)) == 0,
|
KASSERT((all_cpus & (1UL << acpiid)) == 0,
|
||||||
(__func__ ": cpu%d already in CPU map", acpiid));
|
("%s: cpu%d already in CPU map", __func__, acpiid));
|
||||||
|
|
||||||
lid = LID_SAPIC_SET(apicid, apiceid);
|
lid = LID_SAPIC_SET(apicid, apiceid);
|
||||||
|
|
||||||
if ((ia64_get_lid() & LID_SAPIC_MASK) == lid) {
|
if ((ia64_get_lid() & LID_SAPIC_MASK) == lid) {
|
||||||
KASSERT(acpiid == 0,
|
KASSERT(acpiid == 0,
|
||||||
(__func__ ": the BSP must be cpu0"));
|
("%s: the BSP must be cpu0", __func__));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (acpiid != 0) {
|
if (acpiid != 0) {
|
||||||
|
Loading…
Reference in New Issue
Block a user