diff options
Diffstat (limited to 'sys/dev/acpica/acpi_cpu.c')
| -rw-r--r-- | sys/dev/acpica/acpi_cpu.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c index 6eb364db276b..48f6a27c1e89 100644 --- a/sys/dev/acpica/acpi_cpu.c +++ b/sys/dev/acpica/acpi_cpu.c @@ -140,9 +140,6 @@ struct acpi_cpu_device { #define CPUDEV_DEVICE_ID "ACPI0007" -/* Knob to disable acpi_cpu devices */ -bool acpi_cpu_disabled = false; - /* Platform hardware resource information. */ static uint32_t cpu_smi_cmd; /* Value to write to SMI_CMD. */ static uint8_t cpu_cst_cnt; /* Indicate we are _CST aware. */ @@ -239,7 +236,7 @@ acpi_cpu_probe(device_t dev) ACPI_STATUS status; ACPI_OBJECT_TYPE type; - if (acpi_disabled("cpu") || acpi_cpu_disabled) + if (acpi_disabled("cpu")) return (ENXIO); type = acpi_get_type(dev); if (type != ACPI_TYPE_PROCESSOR && type != ACPI_TYPE_DEVICE) @@ -316,7 +313,6 @@ acpi_cpu_attach(device_t dev) struct acpi_cpu_softc *sc; struct acpi_softc *acpi_sc; ACPI_STATUS status; - u_int features; int cpu_id, drv_count, i; driver_t **drivers; uint32_t cap_set[3]; @@ -420,6 +416,8 @@ acpi_cpu_attach(device_t dev) if (devclass_get_drivers(device_get_devclass(dev), &drivers, &drv_count) == 0) { for (i = 0; i < drv_count; i++) { + u_int features = 0; + if (ACPI_GET_FEATURES(drivers[i], &features) == 0) sc->cpu_features |= features; } |