summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-06-27 16:17:51 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-06-27 16:17:51 +0000
commit7d7bd2e0f6f2ff513c8fe705c460f77ba559dd3d (patch)
treee3c7ea7e3a7d7cd4aba11a4f90021f7c64bdef49
parent41f7f2967447337742a146e8ccaae2dc5e03e462 (diff)
quieter boot requested by art
-rw-r--r--sys/arch/amd64/amd64/ioapic.c7
-rw-r--r--sys/arch/amd64/amd64/lapic.c5
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/amd64/amd64/ioapic.c b/sys/arch/amd64/amd64/ioapic.c
index 2a796b4c9a1..93a53155c65 100644
--- a/sys/arch/amd64/amd64/ioapic.c
+++ b/sys/arch/amd64/amd64/ioapic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ioapic.c,v 1.2 2004/06/25 11:31:21 deraadt Exp $ */
+/* $OpenBSD: ioapic.c,v 1.3 2004/06/27 16:17:50 deraadt Exp $ */
/* $NetBSD: ioapic.c,v 1.6 2003/05/15 13:30:31 fvdl Exp $ */
/*-
@@ -344,7 +344,8 @@ ioapic_attach(struct device *parent, struct device *self, void *aux)
* mapping later ...
*/
if (apic_id != sc->sc_apicid) {
- printf("%s: misconfigured as apic %d\n", sc->sc_pic.pic_dev.dv_xname, apic_id);
+ printf("%s: misconfigured as apic %d\n",
+ sc->sc_pic.pic_dev.dv_xname, apic_id);
ioapic_write(sc,IOAPIC_ID,
(ioapic_read(sc,IOAPIC_ID)&~IOAPIC_ID_MASK)
@@ -450,8 +451,6 @@ ioapic_enable(void)
}
for (sc = ioapics; sc != NULL; sc = sc->sc_next) {
- printf("%s: enabling\n", sc->sc_pic.pic_dev.dv_xname);
-
for (p = 0; p < sc->sc_apic_sz; p++) {
ip = &sc->sc_pins[p];
if (ip->ip_type != IST_NONE)
diff --git a/sys/arch/amd64/amd64/lapic.c b/sys/arch/amd64/amd64/lapic.c
index dcf6df2a8c5..70c1536fb13 100644
--- a/sys/arch/amd64/amd64/lapic.c
+++ b/sys/arch/amd64/amd64/lapic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lapic.c,v 1.1 2004/06/25 11:03:27 art Exp $ */
+/* $OpenBSD: lapic.c,v 1.2 2004/06/27 16:17:50 deraadt Exp $ */
/* $NetBSD: lapic.c,v 1.2 2003/05/08 01:04:35 fvdl Exp $ */
/*-
@@ -273,7 +273,8 @@ lapic_calibrate_timer(ci)
u_int64_t dtick, dapic, tmp;
int i;
- printf("%s: calibrating local timer\n", ci->ci_dev->dv_xname);
+ if (mp_verbose)
+ printf("%s: calibrating local timer\n", ci->ci_dev->dv_xname);
/*
* Configure timer to one-shot, interrupt masked,