From: Jan Klemkow <jan@openbsd.org>
Subject: Fix build w/o SUSPEND macro
To: tech@openbsd.org
Date: Fri, 11 Oct 2024 22:33:48 +0200

Hi,

cpu_suspend_primary() is behind a SUSPEND macro.  Thus, acpi_sleep_cpu()
also should be behind a SUSPEND macro or linking of a GENERIC kernel
w/o SUSPEND option will fail.

ok?

bye,
Jan

Index: arch/amd64/amd64/acpi_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/acpi_machdep.c,v
diff -u -p -r1.111 acpi_machdep.c
--- arch/amd64/amd64/acpi_machdep.c	1 Sep 2024 03:08:56 -0000	1.111
+++ arch/amd64/amd64/acpi_machdep.c	11 Oct 2024 20:24:13 -0000
@@ -366,10 +366,10 @@ acpi_attach_machdep(struct acpi_softc *s
 	/* 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
+#ifdef SUSPEND
 /*
  * 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 /* SUSPEND */
 
 bus_dma_tag_t
 acpi_iommu_device_map(struct aml_node *node, bus_dma_tag_t dmat)