Module Name: src
Committed By: bouyer
Date: Sat Apr 17 18:03:21 UTC 2021
Modified Files:
src/sys/arch/x86/x86: pmap.c
Log Message:
Make pat_init() a NOOP on XENPV; it causes a trap with Xen 4.15
To generate a diff of this commit:
cvs rdiff -u -r1.409 -r1.410 src/sys/arch/x86/x86/pmap.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/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.409 src/sys/arch/x86/x86/pmap.c:1.410
--- src/sys/arch/x86/x86/pmap.c:1.409 Sat Feb 6 21:24:19 2021
+++ src/sys/arch/x86/x86/pmap.c Sat Apr 17 18:03:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.409 2021/02/06 21:24:19 jdolecek Exp $ */
+/* $NetBSD: pmap.c,v 1.410 2021/04/17 18:03:21 bouyer Exp $ */
/*
* Copyright (c) 2008, 2010, 2016, 2017, 2019, 2020 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.409 2021/02/06 21:24:19 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.410 2021/04/17 18:03:21 bouyer Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -915,6 +915,7 @@ pmap_exec_fixup(struct vm_map *map, stru
void
pat_init(struct cpu_info *ci)
{
+#ifndef XENPV
uint64_t pat;
if (!(ci->ci_feat_val[0] & CPUID_PAT))
@@ -928,6 +929,7 @@ pat_init(struct cpu_info *ci)
wrmsr(MSR_CR_PAT, pat);
cpu_pat_enabled = true;
+#endif
}
static pt_entry_t
