Index: arch/arm/fdt/acpi_fdt.c =================================================================== RCS file: /cvsroot/src/sys/arch/arm/fdt/acpi_fdt.c,v retrieving revision 1.23 diff -p -u -r1.23 acpi_fdt.c --- arch/arm/fdt/acpi_fdt.c 7 Aug 2021 16:18:43 -0000 1.23 +++ arch/arm/fdt/acpi_fdt.c 25 Nov 2022 21:57:22 -0000 @@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_fdt.c,v #include #include #include -#include #include @@ -63,7 +62,6 @@ static void acpi_fdt_attach(device_t, de static void acpi_fdt_poweroff(device_t); static void acpi_fdt_smbios_init(device_t); -static void acpi_fdt_sysctl_init(void); extern struct arm32_bus_dma_tag acpi_coherent_dma_tag; @@ -124,8 +122,6 @@ acpi_fdt_attach(device_t parent, device_ aa.aa_dmat = NULL; aa.aa_dmat64 = NULL; config_found(self, &aa, NULL, CFARGS_NONE); - - acpi_fdt_sysctl_init(); } static void @@ -226,27 +222,3 @@ acpi_fdt_smbios_init(device_t dev) AcpiOsUnmapMemory(sh, sizeof(*sh)); } } - -static void -acpi_fdt_sysctl_init(void) -{ - const struct sysctlnode *rnode; - int error; - - if (smbios_table == 0) { - return; - } - - error = sysctl_createv(NULL, 0, NULL, &rnode, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "machdep", NULL, - NULL, 0, NULL, 0, CTL_MACHDEP, CTL_EOL); - if (error) { - return; - } - - (void)sysctl_createv(NULL, 0, &rnode, NULL, - CTLFLAG_PERMANENT | CTLFLAG_READONLY | CTLFLAG_HEX, CTLTYPE_QUAD, - "smbios", SYSCTL_DESCR("SMBIOS table pointer"), - NULL, 0, &smbios_table, sizeof(smbios_table), - CTL_CREATE, CTL_EOL); -} Index: dev/smbios_platform.c =================================================================== RCS file: /cvsroot/src/sys/dev/smbios_platform.c,v retrieving revision 1.1 diff -p -u -r1.1 smbios_platform.c --- dev/smbios_platform.c 21 Jul 2021 23:26:15 -0000 1.1 +++ dev/smbios_platform.c 25 Nov 2022 21:57:22 -0000 @@ -76,6 +76,20 @@ platform_init(void) struct smbios_slot *pslot; int nisa, nother; + if (smbios_entry.hdrphys) { + int err; + + err = sysctl_createv(NULL, 0, NULL, NULL, + CTLFLAG_PERMANENT | CTLFLAG_READONLY | CTLFLAG_HEX | + CTLFLAG_IMMEDIATE, CTLTYPE_QUAD, + "smbios", SYSCTL_DESCR("SMBIOS table pointer"), + NULL, smbios_entry.hdrphys, 0, 0, + CTL_MACHDEP, CTL_CREATE, CTL_EOL); + if (err != 0 && err != EEXIST) + printf("platform: sysctl_createv " + "(machdep.smbios) failed, err = %d\n", err); + } + smbios.cookie = 0; if (smbios_find_table(SMBIOS_TYPE_SYSTEM, &smbios)) { psys = smbios.tblhdr;