summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2020-12-27 23:06:34 +0000
committerderaadt <deraadt@openbsd.org>2020-12-27 23:06:34 +0000
commit4a79485ed9d57c586078dc3c5a2940e56130dab3 (patch)
treedbaee7d9f826a876a1a4b601c270c91e8a4dd92a
parentEnable acpihpet on install media, because otherwise clock initialization (diff)
downloadwireguard-openbsd-4a79485ed9d57c586078dc3c5a2940e56130dab3.tar.xz
wireguard-openbsd-4a79485ed9d57c586078dc3c5a2940e56130dab3.zip
acpi_map_address() cannot be wrapped by SMALL_KERNEL anymore, as
it is used by acpihpet.c
-rw-r--r--sys/dev/acpi/acpi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index c40b37c2e8b..4c824ee6cbb 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.394 2020/12/25 12:59:52 visa Exp $ */
+/* $OpenBSD: acpi.c,v 1.395 2020/12/27 23:06:34 deraadt Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -2782,6 +2782,8 @@ acpi_powerdown(void)
;
}
+#endif /* SMALL_KERNEL */
+
int
acpi_map_address(struct acpi_softc *sc, struct acpi_gas *gas, bus_addr_t base,
bus_size_t size, bus_space_handle_t *pioh, bus_space_tag_t *piot)
@@ -2809,8 +2811,6 @@ acpi_map_address(struct acpi_softc *sc, struct acpi_gas *gas, bus_addr_t base,
return 0;
}
-#endif /* SMALL_KERNEL */
-
void
acpi_wakeup(void *arg)
{