[src/netbsd-8]: src/sys/arch/x86/x86 Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/1a00b438a0ff
branches:  netbsd-8
changeset: 434452:1a00b438a0ff
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Nov 30 14:21:48 2017 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #402):
        sys/arch/x86/x86/lapic.c: revision 1.61
Fix a bug introduced in r1.55, this should be LAPIC_BASE.

diffstat:

 sys/arch/x86/x86/lapic.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r d02e6b971267 -r 1a00b438a0ff sys/arch/x86/x86/lapic.c
--- a/sys/arch/x86/x86/lapic.c  Thu Nov 30 14:03:41 2017 +0000
+++ b/sys/arch/x86/x86/lapic.c  Thu Nov 30 14:21:48 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lapic.c,v 1.58.2.2 2017/07/14 08:41:18 martin Exp $    */
+/*     $NetBSD: lapic.c,v 1.58.2.3 2017/11/30 14:21:48 martin Exp $    */
 
 /*-
  * Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.58.2.2 2017/07/14 08:41:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.58.2.3 2017/11/30 14:21:48 martin Exp $");
 
 #include "acpica.h"
 #include "ioapic.h"
@@ -367,7 +367,7 @@
        if (CPUID_TO_FAMILY(curcpu()->ci_signature) >= 6) {
                lapic_base = (paddr_t)rdmsr(MSR_APICBASE);
                if ((lapic_base & APICBASE_PHYSADDR) == 0) {
-                       lapic_base |= APICBASE_PHYSADDR;
+                       lapic_base |= LAPIC_BASE;
                }
                wrmsr(MSR_APICBASE, lapic_base | APICBASE_EN);
                lapic_base &= APICBASE_PHYSADDR;