From 6d4a5aee066cc575a6e99cacfa7ceac834382a96 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Tue, 19 Mar 2002 11:11:37 +0000 Subject: [PATCH] __func__ is a const char *, not a "string" that can be concatenated. --- sys/ia64/ia64/mp_machdep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c index 1ddee36028ff..1a07af7ace54 100644 --- a/sys/ia64/ia64/mp_machdep.c +++ b/sys/ia64/ia64/mp_machdep.c @@ -106,7 +106,7 @@ ia64_ap_startup(void) mtx_lock_spin(&sched_lock); cpu_throw(); - panic(__func__ ": cpu_throw() returned"); + panic("ia64_ap_startup: cpu_throw() returned"); } int @@ -140,13 +140,13 @@ cpu_mp_add(uint acpiid, uint apicid, uint apiceid) } 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); if ((ia64_get_lid() & LID_SAPIC_MASK) == lid) { KASSERT(acpiid == 0, - (__func__ ": the BSP must be cpu0")); + ("%s: the BSP must be cpu0", __func__)); } if (acpiid != 0) {