summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2006-11-29 19:31:38 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2006-11-29 19:31:38 +0000
commit7aa15a56f0736777192c284852a545ef177ffa6a (patch)
tree31edf215074cf3da6a565e70380c854eb6eb30a9 /sys/arch/i386
parentc6fb3020ab4d9e1c846e67c5185d136bfca5e99c (diff)
Don't print masks if we're in apic mode.
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/i386/autoconf.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index 9f133d9d2e7..d46ef4f0e33 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.67 2006/10/29 18:46:52 kettenis Exp $ */
+/* $OpenBSD: autoconf.c,v 1.68 2006/11/29 19:31:37 kettenis Exp $ */
/* $NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $ */
/*-
@@ -130,10 +130,15 @@ cpu_configure(void)
if (config_rootfound("mainbus", NULL) == NULL)
panic("cpu_configure: mainbus not configured");
+#if NIOAPIC > 0
+ if (nioapics > 0)
+ goto nomasks;
+#endif
printf("biomask %x netmask %x ttymask %x\n", (u_short)IMASK(IPL_BIO),
(u_short)IMASK(IPL_NET), (u_short)IMASK(IPL_TTY));
#if NIOAPIC > 0
+ nomasks:
ioapic_enable();
#endif