--- //depot/vendor/freebsd/src/sys/amd64/acpica/acpi_machdep.c	2003/09/22 15:15:28
+++ //depot/user/jhb/acpipci/amd64/acpica/acpi_machdep.c	2003/12/10 11:53:34
@@ -57,3 +57,10 @@
 
 	intr_model = model;
 }
+
+void
+acpi_cpu_c1(void)
+{
+
+	__asm __volatile("sti; hlt");
+}
--- //depot/vendor/freebsd/src/sys/dev/acpica/acpi_cpu.c	2003/12/28 14:15:35
+++ //depot/user/jhb/acpipci/dev/acpica/acpi_cpu.c	2004/01/02 13:35:01
@@ -42,9 +42,6 @@
 #include <dev/pci/pcivar.h>
 #include <machine/atomic.h>
 #include <machine/bus.h>
-#ifdef __ia64__
-#include <machine/pal.h>
-#endif
 #include <sys/rman.h>
 
 #include "acpi.h"
@@ -159,7 +156,6 @@
 static void	acpi_cpu_startup_cx(void);
 static void	acpi_cpu_throttle_set(uint32_t speed);
 static void	acpi_cpu_idle(void);
-static void	acpi_cpu_c1(void);
 static void	acpi_pm_ticksub(uint32_t *end, const uint32_t *start);
 static void	acpi_cpu_notify(ACPI_HANDLE h, UINT32 notify, void *context);
 static int	acpi_cpu_quirks(struct acpi_cpu_softc *sc);
@@ -889,17 +885,6 @@
     atomic_subtract_int(&cpu_idle_busy, 1);
 }
 
-/* Put the CPU in C1 in a machine-dependant way. */
-static void
-acpi_cpu_c1()
-{
-#ifdef __ia64__
-    ia64_call_pal_static(PAL_HALT_LIGHT, 0, 0, 0);
-#else
-    __asm __volatile("sti; hlt");
-#endif
-}
-
 /* Find the difference between two PM tick counts. */
 static void
 acpi_pm_ticksub(uint32_t *end, const uint32_t *start)
--- //depot/vendor/freebsd/src/sys/dev/acpica/acpivar.h	2003/12/23 10:30:45
+++ //depot/user/jhb/acpipci/dev/acpica/acpivar.h	2004/01/02 13:35:01
@@ -263,6 +264,7 @@
 
 extern char	*acpi_name(ACPI_HANDLE handle);
 extern int	acpi_avoid(ACPI_HANDLE handle);
+extern void	acpi_cpu_c1(void);
 extern int	acpi_disabled(char *subsys);
 extern void	acpi_device_enable_wake_capability(ACPI_HANDLE h, int enable);
 extern void	acpi_device_enable_wake_event(ACPI_HANDLE h);
--- //depot/vendor/freebsd/src/sys/i386/acpica/acpi_machdep.c	2003/10/31 16:19:18
+++ //depot/user/jhb/acpipci/i386/acpica/acpi_machdep.c	2003/12/10 11:53:34
@@ -347,3 +347,10 @@
 
 	intr_model = model;
 }
+
+void
+acpi_cpu_c1(void)
+{
+
+	__asm __volatile("sti; hlt");
+}
--- //depot/vendor/freebsd/src/sys/ia64/acpica/acpi_machdep.c	2003/08/28 09:31:42
+++ //depot/user/jhb/acpipci/ia64/acpica/acpi_machdep.c	2003/12/10 11:53:34
@@ -31,6 +31,7 @@
 
 #include "acpi.h"
 #include <dev/acpica/acpivar.h>
+#include <machine/pal.h>
 
 int
 acpi_machdep_init(device_t dev)
@@ -44,3 +45,10 @@
 
 	return (0);
 }
+
+void
+acpi_cpu_c1(void)
+{
+
+	ia64_call_pal_static(PAL_HALT_LIGHT, 0, 0, 0);
+}