Module Name: src
Committed By: martin
Date: Thu Nov 30 14:21:48 UTC 2017
Modified Files:
src/sys/arch/x86/x86 [netbsd-8]: lapic.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.58.2.2 -r1.58.2.3 src/sys/arch/x86/x86/lapic.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/x86/lapic.c
diff -u src/sys/arch/x86/x86/lapic.c:1.58.2.2 src/sys/arch/x86/x86/lapic.c:1.58.2.3
--- src/sys/arch/x86/x86/lapic.c:1.58.2.2 Fri Jul 14 08:41:18 2017
+++ src/sys/arch/x86/x86/lapic.c Thu Nov 30 14:21:48 2017
@@ -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 @@ lapic_map(paddr_t lapic_base)
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;
