diff options
author | njl <njl@FreeBSD.org> | 2005-02-06 07:36:08 +0000 |
---|---|---|
committer | njl <njl@FreeBSD.org> | 2005-02-06 07:36:08 +0000 |
commit | 98ffca48ea5dc716f1f9420ed241eef776bd605a (patch) | |
tree | e918493ac7fc932ecba204af813f8a1c4ec0f795 /sys | |
parent | b45580b648784f3e8b0469fa6d560ae5e810cae6 (diff) | |
download | FreeBSD-src-98ffca48ea5dc716f1f9420ed241eef776bd605a.zip FreeBSD-src-98ffca48ea5dc716f1f9420ed241eef776bd605a.tar.gz |
Staticize the legacy cpu devclasses and revert the name for the acpi_cpu
devclass. As pointed out by dfr@, devclasses don't have to share the same
linkage if multiple drivers have the same name. Newbus should match the
devclasses based on name and allocate non-conflicting unit numbers.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/amd64/legacy.c | 2 | ||||
-rw-r--r-- | sys/dev/acpica/acpi_cpu.c | 6 | ||||
-rw-r--r-- | sys/i386/i386/legacy.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/amd64/amd64/legacy.c b/sys/amd64/amd64/legacy.c index 5135732..112a96a 100644 --- a/sys/amd64/amd64/legacy.c +++ b/sys/amd64/amd64/legacy.c @@ -279,7 +279,7 @@ static driver_t cpu_driver = { cpu_methods, 1, /* no softc */ }; -devclass_t cpu_devclass; +static devclass_t cpu_devclass; DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0); static device_t diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c index a86423d..22d58cf 100644 --- a/sys/dev/acpica/acpi_cpu.c +++ b/sys/dev/acpica/acpi_cpu.c @@ -203,8 +203,8 @@ static driver_t acpi_cpu_driver = { sizeof(struct acpi_cpu_softc), }; -static devclass_t cpu_devclass; -DRIVER_MODULE(cpu, acpi, acpi_cpu_driver, cpu_devclass, 0, 0); +static devclass_t acpi_cpu_devclass; +DRIVER_MODULE(cpu, acpi, acpi_cpu_driver, acpi_cpu_devclass, 0, 0); MODULE_DEPEND(cpu, acpi, 1, 1, 1); static int @@ -760,7 +760,7 @@ acpi_cpu_startup(void *arg) int count, i; /* Get set of CPU devices */ - devclass_get_devices(cpu_devclass, &cpu_devices, &cpu_ndevices); + devclass_get_devices(acpi_cpu_devclass, &cpu_devices, &cpu_ndevices); /* Check for quirks via the first CPU device. */ sc = device_get_softc(cpu_devices[0]); diff --git a/sys/i386/i386/legacy.c b/sys/i386/i386/legacy.c index ea7fc25..276c40f 100644 --- a/sys/i386/i386/legacy.c +++ b/sys/i386/i386/legacy.c @@ -300,7 +300,7 @@ static driver_t cpu_driver = { cpu_methods, 1, /* no softc */ }; -devclass_t cpu_devclass; +static devclass_t cpu_devclass; DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0); static device_t |