diff --git a/sys/alpha/alpha/mp_machdep.c b/sys/alpha/alpha/mp_machdep.c
index 3892113f6752..294d16a5a41e 100644
--- a/sys/alpha/alpha/mp_machdep.c
+++ b/sys/alpha/alpha/mp_machdep.c
@@ -530,7 +530,7 @@ static void
 release_aps(void *dummy __unused)
 {
 	if (bootverbose)
-		printf(__func__ ": releasing secondary CPUs\n");
+		printf("%s: releasing secondary CPUs\n", __func__);
 	atomic_store_rel_int(&aps_ready, 1);
 }
 
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 9b52fb1d6398..a779ff0482c7 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/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/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index 9b52fb1d6398..a779ff0482c7 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/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/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index 9b52fb1d6398..a779ff0482c7 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/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); 
 }
 
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 9b52fb1d6398..a779ff0482c7 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 9b52fb1d6398..a779ff0482c7 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 9b52fb1d6398..a779ff0482c7 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); 
 }