The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=25df388574ac1d295f4014825de0df1d65cbdc53
commit 25df388574ac1d295f4014825de0df1d65cbdc53 Author: Olivier Certner <[email protected]> AuthorDate: 2026-06-26 15:12:58 +0000 Commit: Olivier Certner <[email protected]> CommitDate: 2026-06-26 15:23:39 +0000 acpi_hpet(4): Remove unused 'acpi_hpet_disabled' boolean Same reason as for the previous commit to acpi_cpu(4). This boolean is not used anywhere. Disabling acpi_hpet(4) can be done through the regular ACPI disable mechanism (using the 'debug.acpi.disabled' tunable, see acpi_disabled()). Reviewed by: emaste (implicit) Fixes: ac3ede5371af ("x86/xen: remove PVHv1 code") MFC after: 3 days Event: Halifax Hackathon 202606 Location: Dalhousie CS Faculty building Sponsored by: The FreeBSD Foundation --- sys/dev/acpica/acpi_hpet.c | 5 +---- sys/x86/include/init.h | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/dev/acpica/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c index 9a1abe6ca72d..43fd743fd168 100644 --- a/sys/dev/acpica/acpi_hpet.c +++ b/sys/dev/acpica/acpi_hpet.c @@ -131,9 +131,6 @@ static void hpet_test(struct hpet_softc *sc); static char *hpet_ids[] = { "PNP0103", NULL }; -/* Knob to disable acpi_hpet device */ -bool acpi_hpet_disabled = false; - static u_int hpet_get_timecount(struct timecounter *tc) { @@ -455,7 +452,7 @@ hpet_probe(device_t dev) int rv; ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); - if (acpi_disabled("hpet") || acpi_hpet_disabled) + if (acpi_disabled("hpet")) return (ENXIO); if (acpi_get_handle(dev) != NULL) rv = ACPI_ID_PROBE(device_get_parent(dev), dev, hpet_ids, NULL); diff --git a/sys/x86/include/init.h b/sys/x86/include/init.h index 1977f4729487..42b194de26b9 100644 --- a/sys/x86/include/init.h +++ b/sys/x86/include/init.h @@ -43,9 +43,6 @@ struct init_ops { extern struct init_ops init_ops; -/* Knob to disable acpi_hpet device */ -extern bool acpi_hpet_disabled; - /* Knob to disable acpi_timer device */ extern bool acpi_timer_disabled;
