From b2f9c8c62d22b4458a4c7ea15bcf82744297c45b Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 18 Jan 2002 04:41:23 +0000 Subject: Avoid __func__ string concatenation --- sys/i386/i386/mp_machdep.c | 8 ++++---- sys/i386/i386/mptable.c | 8 ++++---- sys/i386/include/mptable.h | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'sys/i386') diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 9b52fb1..a779ff0 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -2385,7 +2385,7 @@ void ipi_selected(u_int32_t cpus, u_int ipi) { - CTR2(KTR_SMP, __func__ ": cpus: %x ipi: %x", cpus, ipi); + CTR3(KTR_SMP, "%s: cpus: %x ipi: %x", __func__, cpus, ipi); selected_apic_ipi(cpus, ipi, APIC_DELMODE_FIXED); } @@ -2396,7 +2396,7 @@ void ipi_all(u_int ipi) { - CTR1(KTR_SMP, __func__ ": ipi: %x", ipi); + CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); apic_ipi(APIC_DEST_ALLISELF, ipi, APIC_DELMODE_FIXED); } @@ -2407,7 +2407,7 @@ void ipi_all_but_self(u_int ipi) { - CTR1(KTR_SMP, __func__ ": ipi: %x", ipi); + CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); apic_ipi(APIC_DEST_ALLESELF, ipi, APIC_DELMODE_FIXED); } @@ -2418,7 +2418,7 @@ void ipi_self(u_int ipi) { - CTR1(KTR_SMP, __func__ ": ipi: %x", ipi); + CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); apic_ipi(APIC_DEST_SELF, ipi, APIC_DELMODE_FIXED); } diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c index 9b52fb1..a779ff0 100644 --- a/sys/i386/i386/mptable.c +++ b/sys/i386/i386/mptable.c @@ -2385,7 +2385,7 @@ void ipi_selected(u_int32_t cpus, u_int ipi) { - CTR2(KTR_SMP, __func__ ": cpus: %x ipi: %x", cpus, ipi); + CTR3(KTR_SMP, "%s: cpus: %x ipi: %x", __func__, cpus, ipi); selected_apic_ipi(cpus, ipi, APIC_DELMODE_FIXED); } @@ -2396,7 +2396,7 @@ void ipi_all(u_int ipi) { - CTR1(KTR_SMP, __func__ ": ipi: %x", ipi); + CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); apic_ipi(APIC_DEST_ALLISELF, ipi, APIC_DELMODE_FIXED); } @@ -2407,7 +2407,7 @@ void ipi_all_but_self(u_int ipi) { - CTR1(KTR_SMP, __func__ ": ipi: %x", ipi); + CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); apic_ipi(APIC_DEST_ALLESELF, ipi, APIC_DELMODE_FIXED); } @@ -2418,7 +2418,7 @@ void ipi_self(u_int ipi) { - CTR1(KTR_SMP, __func__ ": ipi: %x", ipi); + CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); apic_ipi(APIC_DEST_SELF, ipi, APIC_DELMODE_FIXED); } diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h index 9b52fb1..a779ff0 100644 --- a/sys/i386/include/mptable.h +++ b/sys/i386/include/mptable.h @@ -2385,7 +2385,7 @@ void ipi_selected(u_int32_t cpus, u_int ipi) { - CTR2(KTR_SMP, __func__ ": cpus: %x ipi: %x", cpus, ipi); + CTR3(KTR_SMP, "%s: cpus: %x ipi: %x", __func__, cpus, ipi); selected_apic_ipi(cpus, ipi, APIC_DELMODE_FIXED); } @@ -2396,7 +2396,7 @@ void ipi_all(u_int ipi) { - CTR1(KTR_SMP, __func__ ": ipi: %x", ipi); + CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); apic_ipi(APIC_DEST_ALLISELF, ipi, APIC_DELMODE_FIXED); } @@ -2407,7 +2407,7 @@ void ipi_all_but_self(u_int ipi) { - CTR1(KTR_SMP, __func__ ": ipi: %x", ipi); + CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); apic_ipi(APIC_DEST_ALLESELF, ipi, APIC_DELMODE_FIXED); } @@ -2418,7 +2418,7 @@ void ipi_self(u_int ipi) { - CTR1(KTR_SMP, __func__ ": ipi: %x", ipi); + CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi); apic_ipi(APIC_DEST_SELF, ipi, APIC_DELMODE_FIXED); } -- cgit v1.1