 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_wakeup.c,v 1.8 2008/09/10 03:56:12 jmcneill Exp $	*/
+/*	$NetBSD: acpi_wakeup.c,v 1.9 2008/09/19 11:15:50 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Takuya SHIOZAKI.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.8 2008/09/10 03:56:12 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.9 2008/09/19 11:15:50 jmcneill Exp $");
 /*-
  * Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
  * Copyright (c) 2001 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -305,42 +305,43 @@ acpi_cpu_sleep(struct cpu_info *ci)
 	lapic_initclocks();
 #endif
 	atomic_or_32(&ci->ci_flags, CPUF_RUNNING);
 	atomic_or_32(&cpus_running, ci->ci_cpumask);
 	x86_enable_intr();
+}
 #endif
 int
 acpi_md_sleep(int state)
+{
-	int ret = 0;
+	int s, ret = 0;
 #ifdef MULTIPROCESSOR
 	struct cpu_info *ci;
 	CPU_INFO_ITERATOR cii;
 #endif
 	KASSERT(acpi_wakeup_paddr != 0);
 	KASSERT(sizeof(wakecode) <= PAGE_SIZE);
 	if (!CPU_IS_PRIMARY(curcpu())) {
 		printf("acpi0: WARNING: ignoring sleep from secondary CPU\n");
 		return -1;
+	}
 	AcpiSetFirmwareWakingVector(acpi_wakeup_paddr);
 	s = splhigh();
 #ifdef __i386__
 	npxsave_cpu(true);
 #else
 	fpusave_cpu(true);
 #endif
 	x86_disable_intr();
 #ifdef MULTIPROCESSOR
 	/* Save and suspend Application Processors */
 	x86_broadcast_ipi(X86_IPI_ACPI_CPU_SLEEP);
 	while (cpus_running != curcpu()->ci_cpumask)
 		delay(1);
 #endif
 @@ -377,26 +378,27 @@ out:
 		if (CPU_IS_PRIMARY(ci))
 			continue;
 		acpi_md_sleep_patch(ci);
 		CPU_STARTUP(ci, acpi_wakeup_paddr);
 		CPU_START_CLEANUP(ci);
 		while ((ci->ci_flags & CPUF_RUNNING) == 0)
 			x86_pause();
+	}
 #endif
 	x86_enable_intr();
 	splx(s);
 #ifdef MTRR
 	if (mtrr_funcs != NULL)
 		mtrr_commit();
 #endif
 	return (ret);
+}
 void
 acpi_md_sleep_init(void)
+{
 	/* Map ACPI wakecode */