Module Name: src
Committed By: maxv
Date: Wed Jul 27 13:04:29 UTC 2016
Modified Files:
src/sys/arch/x86/acpi: acpi_wakeup.c
Log Message:
Call cpu_init_msrs on i386 when waking up. Currently it does not change
anything, since MSR_EFER is already enabled earlier. But if we add new
MSRs in the future, we will want them when waking up as well.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 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.40 src/sys/arch/x86/acpi/acpi_wakeup.c:1.41
--- src/sys/arch/x86/acpi/acpi_wakeup.c:1.40 Sun Jul 24 14:09:22 2016
+++ src/sys/arch/x86/acpi/acpi_wakeup.c Wed Jul 27 13:04:28 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakeup.c,v 1.40 2016/07/24 14:09:22 maxv Exp $ */
+/* $NetBSD: acpi_wakeup.c,v 1.41 2016/07/27 13:04:28 maxv Exp $ */
/*-
* Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.40 2016/07/24 14:09:22 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.41 2016/07/27 13:04:28 maxv Exp $");
/*-
* Copyright (c) 2001 Takanori Watanabe <takaw...@jp.freebsd.org>
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.40 2016/07/24 14:09:22 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.41 2016/07/27 13:04:28 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -262,10 +262,9 @@ acpi_cpu_sleep(struct cpu_info *ci)
return;
/* Execute Wakeup */
-#ifndef __i386__
cpu_init_msrs(ci, false);
-#endif
fpuinit(ci);
+
#if NLAPIC > 0
lapic_enable();
lapic_set_lvt();
