Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x86/acpi Reload the MSRs on the original cpu on i38...



details:   https://anonhg.NetBSD.org/src/rev/b15f5b1d3d59
branches:  trunk
changeset: 818631:b15f5b1d3d59
user:      maxv <maxv%NetBSD.org@localhost>
date:      Thu Oct 20 14:06:18 2016 +0000

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

diffstat:

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

diffs (28 lines):

diff -r c137353ede91 -r b15f5b1d3d59 sys/arch/x86/acpi/acpi_wakeup.c
--- a/sys/arch/x86/acpi/acpi_wakeup.c   Thu Oct 20 09:53:07 2016 +0000
+++ b/sys/arch/x86/acpi/acpi_wakeup.c   Thu Oct 20 14:06:18 2016 +0000
@@ -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 @@
                goto out;
 
        /* Execute Wakeup */
-#ifndef __i386__
        cpu_init_msrs(&cpu_info_primary, false);
-#endif
        fpuinit(&cpu_info_primary);
        i8259_reinit();
 #if NLAPIC > 0



Home | Main Index | Thread Index | Old Index