Module Name: src
Committed By: maxv
Date: Thu Oct 20 14:06:18 UTC 2016
Modified Files:
src/sys/arch/x86/acpi: acpi_wakeup.c
Log Message:
Reload the MSRs on the original cpu on i386 - looks like I forgot this part
in my rev1.41. Technically it does not change anything, since the only MSR
is NOX and it is already reloaded in the trampoline.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/x86/acpi/acpi_wakeup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/acpi_wakeup.c
diff -u src/sys/arch/x86/acpi/acpi_wakeup.c:1.43 src/sys/arch/x86/acpi/acpi_wakeup.c:1.44
--- src/sys/arch/x86/acpi/acpi_wakeup.c:1.43 Fri Oct 7 10:58:03 2016
+++ src/sys/arch/x86/acpi/acpi_wakeup.c Thu Oct 20 14:06:18 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakeup.c,v 1.43 2016/10/07 10:58:03 skrll Exp $ */
+/* $NetBSD: acpi_wakeup.c,v 1.44 2016/10/20 14:06:18 maxv Exp $ */
/*-
* Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.43 2016/10/07 10:58:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.44 2016/10/20 14:06:18 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -313,9 +313,7 @@ acpi_md_sleep(int state)
goto out;
/* Execute Wakeup */
-#ifndef __i386__
cpu_init_msrs(&cpu_info_primary, false);
-#endif
fpuinit(&cpu_info_primary);
i8259_reinit();
#if NLAPIC > 0
