Index: usr.sbin/acpi/acpidump/acpi_user.c =================================================================== --- usr.sbin/acpi/acpidump/acpi_user.c +++ usr.sbin/acpi/acpidump/acpi_user.c @@ -44,7 +44,6 @@ #include "acpidump.h" -static char hint_acpi_0_rsdp[] = "hint.acpi.0.rsdp"; static char machdep_acpi_root[] = "machdep.acpi_root"; static int acpi_mem_fd = -1; @@ -165,23 +164,14 @@ acpi_find_rsd_ptr(void) { ACPI_TABLE_RSDP *rsdp; - char buf[20]; u_long addr; size_t len; acpi_user_init(); - addr = 0; - - /* Attempt to use kenv or sysctl to find RSD PTR record. */ - if (kenv(KENV_GET, hint_acpi_0_rsdp, buf, 20) > 0) - addr = strtoul(buf, NULL, 0); - if (addr == 0) { - len = sizeof(addr); - if (sysctlbyname(machdep_acpi_root, &addr, &len, NULL, 0) != 0) - addr = 0; - } - if (addr != 0 && (rsdp = acpi_get_rsdp(addr)) != NULL) + len = sizeof(addr); + if (sysctlbyname(machdep_acpi_root, &addr, &len, NULL, 0) == 0 && + (rsdp = acpi_get_rsdp(addr)) != NULL) return (rsdp); return (acpi_scan_rsd_ptr());