diff options
| author | jhb <jhb@FreeBSD.org> | 2007-03-09 15:49:57 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2007-03-09 15:49:57 +0000 |
| commit | 7894c3ad2075da8bd7baf7a8a8e07142b2924575 (patch) | |
| tree | 83138d00cb08632986d382f59d5fe52ff6e68668 /sys/i386 | |
| parent | 723794ddf2cd49766da9cf0ddcb83b8fedb4a67a (diff) | |
| download | FreeBSD-src-7894c3ad2075da8bd7baf7a8a8e07142b2924575.zip FreeBSD-src-7894c3ad2075da8bd7baf7a8a8e07142b2924575.tar.gz | |
Defer calling lapic_init() until we've completed the 'MPTable: <...>'
printf. Otherwise, printfs inside of lapic_init() (such as during a
verbose boot) can uglify the output.
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/mptable.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c index 5cfe1661..5faf7c0 100644 --- a/sys/i386/i386/mptable.c +++ b/sys/i386/i386/mptable.c @@ -321,18 +321,20 @@ mptable_probe_cpus(void) static int mptable_setup_local(void) { + vm_paddr_t addr; /* Is this a pre-defined config? */ printf("MPTable: <"); if (mpfps->config_type != 0) { - lapic_init(DEFAULT_APIC_BASE); + addr = DEFAULT_APIC_BASE; printf("Default Configuration %d", mpfps->config_type); } else { - lapic_init(mpct->apic_address); + addr = mpct->apic_address; printf("%.*s %.*s", (int)sizeof(mpct->oem_id), mpct->oem_id, (int)sizeof(mpct->product_id), mpct->product_id); } printf(">\n"); + lapic_init(addr); return (0); } |
