From owner-p4-projects Mon Mar 18 23:11: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 292A937B41C; Mon, 18 Mar 2002 23:10:55 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C9DF937B404 for ; Mon, 18 Mar 2002 23:10:52 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J7Aqw46802 for perforce@freebsd.org; Mon, 18 Mar 2002 23:10:52 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 18 Mar 2002 23:10:52 -0800 (PST) Message-Id: <200203190710.g2J7Aqw46802@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7913 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7913 Change 7913 by peter@peter_overcee on 2002/03/18 23:10:23 fix more __func__ concatenation Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#8 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#8 (text+ko) ==== @@ -106,7 +106,7 @@ mtx_lock_spin(&sched_lock); cpu_throw(); - panic(__func__ ": cpu_throw() returned"); + panic("ia64_ap_startup: cpu_throw() returned"); } int @@ -140,13 +140,13 @@ } 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) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message