[src/trunk]: src/sys/arch/x86/acpi Call cpu_init_msrs on i386 when waking up....

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/502fcc259dba
branches:  trunk
changeset: 346682:502fcc259dba
user:      maxv <maxv%NetBSD.org@localhost>
date:      Wed Jul 27 13:04:28 2016 +0000

description:
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.

diffstat:

 sys/arch/x86/acpi/acpi_wakeup.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r 7daf1481efce -r 502fcc259dba sys/arch/x86/acpi/acpi_wakeup.c
--- a/sys/arch/x86/acpi/acpi_wakeup.c   Wed Jul 27 12:08:46 2016 +0000
+++ b/sys/arch/x86/acpi/acpi_wakeup.c   Wed Jul 27 13:04:28 2016 +0000
@@ -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 <takawata%jp.freebsd.org@localhost>
@@ -62,7 +62,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 $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -262,10 +262,9 @@
                return;
 
        /* Execute Wakeup */
-#ifndef __i386__
        cpu_init_msrs(ci, false);
-#endif
        fpuinit(ci);
+
 #if NLAPIC > 0
        lapic_enable();
        lapic_set_lvt();