From 456b8adfdd0126dbe5968dfdecfcb1f96c4a7e49 Mon Sep 17 00:00:00 2001 From: jan Date: Mon, 14 Oct 2024 11:49:34 +0000 Subject: [PATCH] Fix build w/o SUSPEND option with tweaks from miod@ ok miod@ --- sys/arch/amd64/amd64/acpi_machdep.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arch/amd64/amd64/acpi_machdep.c b/sys/arch/amd64/amd64/acpi_machdep.c index 071da1abb1d..13b3dab3232 100644 --- a/sys/arch/amd64/amd64/acpi_machdep.c +++ b/sys/arch/amd64/amd64/acpi_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi_machdep.c,v 1.111 2024/09/01 03:08:56 jsg Exp $ */ +/* $OpenBSD: acpi_machdep.c,v 1.112 2024/10/14 11:49:34 jan Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert * @@ -366,10 +366,10 @@ acpi_attach_machdep(struct acpi_softc *sc) /* Unmap, will be remapped in acpi_sleep_cpu */ pmap_kremove(ACPI_TRAMPOLINE, PAGE_SIZE); pmap_kremove(ACPI_TRAMP_DATA, PAGE_SIZE); -#endif /* SMALL_KERNEL */ +#endif /* ! SMALL_KERNEL */ } -#ifndef SMALL_KERNEL +#if defined(SUSPEND) && !defined(SMALL_KERNEL) /* * This function may not have local variables due to a bug between * acpi_savecpu() and the resume path. @@ -562,7 +562,7 @@ resume_mp(void) } #endif /* MULTIPROCESSOR */ -#endif /* ! SMALL_KERNEL */ +#endif /* defined(SUSPEND) && !defined(SMALL_KERNEL) */ bus_dma_tag_t acpi_iommu_device_map(struct aml_node *node, bus_dma_tag_t dmat) -- 2.20.1