diff options
| author | peter <peter@FreeBSD.org> | 2003-12-06 23:14:44 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2003-12-06 23:14:44 +0000 |
| commit | a577ca572eadeb38c87d27b484d2a82f7f1aa518 (patch) | |
| tree | 35a4e7ed3452b456ace66e12c05b8a2e4807acd6 /sys | |
| parent | 2b3cd18249bc5fe2b2163525085781ae3ba8316d (diff) | |
| download | FreeBSD-src-a577ca572eadeb38c87d27b484d2a82f7f1aa518.zip FreeBSD-src-a577ca572eadeb38c87d27b484d2a82f7f1aa518.tar.gz | |
MFi386: put the apic disable hook in a better place.
Approved by: re (scottl)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/acpica/madt.c | 2 | ||||
| -rw-r--r-- | sys/amd64/amd64/local_apic.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sys/amd64/acpica/madt.c b/sys/amd64/acpica/madt.c index 3406590..71be5ba 100644 --- a/sys/amd64/acpica/madt.c +++ b/sys/amd64/acpica/madt.c @@ -190,7 +190,7 @@ madt_probe(void) XSDT_DESCRIPTOR *xsdt; int i, count; - if (resource_disabled("acpi", 0) || resource_disabled("apic", 0)) + if (resource_disabled("acpi", 0)) return (ENXIO); /* diff --git a/sys/amd64/amd64/local_apic.c b/sys/amd64/amd64/local_apic.c index bdff518..2afa52d 100644 --- a/sys/amd64/amd64/local_apic.c +++ b/sys/amd64/amd64/local_apic.c @@ -551,6 +551,10 @@ apic_init(void *dummy __unused) if (!(cpu_feature & CPUID_APIC)) return; + /* Don't probe if APIC mode is disabled. */ + if (resource_disabled("apic", 0)) + return; + /* First, probe all the enumerators to find the best match. */ best_enum = NULL; best = 0; |
