diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index ebbbc23f63d3..a6b3929c2827 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.70 1997/07/08 23:42:02 fsmp Exp $
+ *	$Id: autoconf.c,v 1.3 1997/07/20 17:06:24 smp Exp smp $
  */
 
 /*
@@ -220,6 +220,15 @@ configure(dummy)
 	cninit_finish();
 
 	if (bootverbose) {
+
+#ifdef APIC_IO
+		printf("SMP: enabled INTs: ");
+		for (i = 0; i < 24; ++i)
+			if ((imen & (1 << i)) == 0)
+	        		printf("%d, ", i);
+		printf("imen: 0x%08x\n", imen);
+#endif /* APIC_IO */
+
 		/*
 		 * Print out the BIOS's idea of the disk geometries.
 		 */
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index d3cbf2caf712..343ea7db2f7c 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
+ *	$Id: mp_machdep.c,v 1.17 1997/07/20 17:43:20 smp Exp smp $
  */
 
 #include "opt_smp.h"
@@ -349,7 +349,7 @@ mp_announce(void)
 	printf(", version: 0x%08x", cpu_apic_versions[0]);
 	printf(", at 0x%08x\n", cpu_apic_address);
 	for (x = 1; x <= mp_naps; ++x) {
-		printf(" cpu%d (AP):  apic id: %d", x, CPU_TO_ID(x));
+		printf(" cpu%d (AP):  apic id: %2d", x, CPU_TO_ID(x));
 		printf(", version: 0x%08x", cpu_apic_versions[x]);
 		printf(", at 0x%08x\n", cpu_apic_address);
 	}
@@ -428,7 +428,7 @@ bsp_apic_configure(void)
         lapic.lvt_lint1 = temp;
 
 	if (bootverbose)
-		apic_dump();
+		apic_dump("bsp_apic_configure()");
 }
 #endif  /* APIC_IO */
 
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index d3cbf2caf712..343ea7db2f7c 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
+ *	$Id: mp_machdep.c,v 1.17 1997/07/20 17:43:20 smp Exp smp $
  */
 
 #include "opt_smp.h"
@@ -349,7 +349,7 @@ mp_announce(void)
 	printf(", version: 0x%08x", cpu_apic_versions[0]);
 	printf(", at 0x%08x\n", cpu_apic_address);
 	for (x = 1; x <= mp_naps; ++x) {
-		printf(" cpu%d (AP):  apic id: %d", x, CPU_TO_ID(x));
+		printf(" cpu%d (AP):  apic id: %2d", x, CPU_TO_ID(x));
 		printf(", version: 0x%08x", cpu_apic_versions[x]);
 		printf(", at 0x%08x\n", cpu_apic_address);
 	}
@@ -428,7 +428,7 @@ bsp_apic_configure(void)
         lapic.lvt_lint1 = temp;
 
 	if (bootverbose)
-		apic_dump();
+		apic_dump("bsp_apic_configure()");
 }
 #endif  /* APIC_IO */
 
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index d3cbf2caf712..343ea7db2f7c 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
+ *	$Id: mp_machdep.c,v 1.17 1997/07/20 17:43:20 smp Exp smp $
  */
 
 #include "opt_smp.h"
@@ -349,7 +349,7 @@ mp_announce(void)
 	printf(", version: 0x%08x", cpu_apic_versions[0]);
 	printf(", at 0x%08x\n", cpu_apic_address);
 	for (x = 1; x <= mp_naps; ++x) {
-		printf(" cpu%d (AP):  apic id: %d", x, CPU_TO_ID(x));
+		printf(" cpu%d (AP):  apic id: %2d", x, CPU_TO_ID(x));
 		printf(", version: 0x%08x", cpu_apic_versions[x]);
 		printf(", at 0x%08x\n", cpu_apic_address);
 	}
@@ -428,7 +428,7 @@ bsp_apic_configure(void)
         lapic.lvt_lint1 = temp;
 
 	if (bootverbose)
-		apic_dump();
+		apic_dump("bsp_apic_configure()");
 }
 #endif  /* APIC_IO */
 
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index ebbbc23f63d3..a6b3929c2827 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.70 1997/07/08 23:42:02 fsmp Exp $
+ *	$Id: autoconf.c,v 1.3 1997/07/20 17:06:24 smp Exp smp $
  */
 
 /*
@@ -220,6 +220,15 @@ configure(dummy)
 	cninit_finish();
 
 	if (bootverbose) {
+
+#ifdef APIC_IO
+		printf("SMP: enabled INTs: ");
+		for (i = 0; i < 24; ++i)
+			if ((imen & (1 << i)) == 0)
+	        		printf("%d, ", i);
+		printf("imen: 0x%08x\n", imen);
+#endif /* APIC_IO */
+
 		/*
 		 * Print out the BIOS's idea of the disk geometries.
 		 */
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index d3cbf2caf712..343ea7db2f7c 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
+ *	$Id: mp_machdep.c,v 1.17 1997/07/20 17:43:20 smp Exp smp $
  */
 
 #include "opt_smp.h"
@@ -349,7 +349,7 @@ mp_announce(void)
 	printf(", version: 0x%08x", cpu_apic_versions[0]);
 	printf(", at 0x%08x\n", cpu_apic_address);
 	for (x = 1; x <= mp_naps; ++x) {
-		printf(" cpu%d (AP):  apic id: %d", x, CPU_TO_ID(x));
+		printf(" cpu%d (AP):  apic id: %2d", x, CPU_TO_ID(x));
 		printf(", version: 0x%08x", cpu_apic_versions[x]);
 		printf(", at 0x%08x\n", cpu_apic_address);
 	}
@@ -428,7 +428,7 @@ bsp_apic_configure(void)
         lapic.lvt_lint1 = temp;
 
 	if (bootverbose)
-		apic_dump();
+		apic_dump("bsp_apic_configure()");
 }
 #endif  /* APIC_IO */
 
diff --git a/sys/i386/i386/mpapic.c b/sys/i386/i386/mpapic.c
index b342344c3817..25bc4c40f58c 100644
--- a/sys/i386/i386/mpapic.c
+++ b/sys/i386/i386/mpapic.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mpapic.c,v 1.14 1997/07/18 21:27:53 fsmp Exp $
+ *	$Id: mpapic.c,v 1.14 1997/07/20 17:40:39 smp Exp smp $
  */
 
 #include "opt_smp.h"
@@ -103,7 +103,7 @@ apic_initialize(void)
 	lapic.svr = temp;
 
 	if (bootverbose)
-		apic_dump();
+		apic_dump("apic_initialize()");
 }
 
 
@@ -111,10 +111,10 @@ apic_initialize(void)
  * dump contents of local APIC registers
  */
 void
-apic_dump(void)
+apic_dump(char* str)
 {
-	printf("SMP: CPU%02d bsp_apic_configure() lint0: 0x%08x\n",
-	       cpuid, lapic.lvt_lint0);
+	printf("SMP: CPU%02d %s lint0: 0x%08x\n",
+	       cpuid, str, lapic.lvt_lint0);
 	printf("                                lint1: 0x%08x\n",
 	       lapic.lvt_lint1);
 	printf("                                TPR:   0x%08x\n", lapic.tpr);
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index d3cbf2caf712..343ea7db2f7c 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
+ *	$Id: mp_machdep.c,v 1.17 1997/07/20 17:43:20 smp Exp smp $
  */
 
 #include "opt_smp.h"
@@ -349,7 +349,7 @@ mp_announce(void)
 	printf(", version: 0x%08x", cpu_apic_versions[0]);
 	printf(", at 0x%08x\n", cpu_apic_address);
 	for (x = 1; x <= mp_naps; ++x) {
-		printf(" cpu%d (AP):  apic id: %d", x, CPU_TO_ID(x));
+		printf(" cpu%d (AP):  apic id: %2d", x, CPU_TO_ID(x));
 		printf(", version: 0x%08x", cpu_apic_versions[x]);
 		printf(", at 0x%08x\n", cpu_apic_address);
 	}
@@ -428,7 +428,7 @@ bsp_apic_configure(void)
         lapic.lvt_lint1 = temp;
 
 	if (bootverbose)
-		apic_dump();
+		apic_dump("bsp_apic_configure()");
 }
 #endif  /* APIC_IO */
 
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index d3cbf2caf712..343ea7db2f7c 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
+ *	$Id: mp_machdep.c,v 1.17 1997/07/20 17:43:20 smp Exp smp $
  */
 
 #include "opt_smp.h"
@@ -349,7 +349,7 @@ mp_announce(void)
 	printf(", version: 0x%08x", cpu_apic_versions[0]);
 	printf(", at 0x%08x\n", cpu_apic_address);
 	for (x = 1; x <= mp_naps; ++x) {
-		printf(" cpu%d (AP):  apic id: %d", x, CPU_TO_ID(x));
+		printf(" cpu%d (AP):  apic id: %2d", x, CPU_TO_ID(x));
 		printf(", version: 0x%08x", cpu_apic_versions[x]);
 		printf(", at 0x%08x\n", cpu_apic_address);
 	}
@@ -428,7 +428,7 @@ bsp_apic_configure(void)
         lapic.lvt_lint1 = temp;
 
 	if (bootverbose)
-		apic_dump();
+		apic_dump("bsp_apic_configure()");
 }
 #endif  /* APIC_IO */
 
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index d3cbf2caf712..343ea7db2f7c 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
+ *	$Id: mp_machdep.c,v 1.17 1997/07/20 17:43:20 smp Exp smp $
  */
 
 #include "opt_smp.h"
@@ -349,7 +349,7 @@ mp_announce(void)
 	printf(", version: 0x%08x", cpu_apic_versions[0]);
 	printf(", at 0x%08x\n", cpu_apic_address);
 	for (x = 1; x <= mp_naps; ++x) {
-		printf(" cpu%d (AP):  apic id: %d", x, CPU_TO_ID(x));
+		printf(" cpu%d (AP):  apic id: %2d", x, CPU_TO_ID(x));
 		printf(", version: 0x%08x", cpu_apic_versions[x]);
 		printf(", at 0x%08x\n", cpu_apic_address);
 	}
@@ -428,7 +428,7 @@ bsp_apic_configure(void)
         lapic.lvt_lint1 = temp;
 
 	if (bootverbose)
-		apic_dump();
+		apic_dump("bsp_apic_configure()");
 }
 #endif  /* APIC_IO */