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

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

details:   https://anonhg.NetBSD.org/src/rev/74b5093dd506
branches:  netbsd-9
changeset: 985735:74b5093dd506
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Sep 03 10:27:33 2021 +0000

description:
Pull up following revision(s) (requested by manu in ticket #1341):

        sys/arch/x86/x86/pmap.c: revision 1.410

Make pat_init() a NOOP on XENPV; it causes a trap with Xen 4.15

diffstat:

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

diffs (34 lines):

diff -r 200ff35ca1bd -r 74b5093dd506 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Fri Sep 03 10:25:36 2021 +0000
+++ b/sys/arch/x86/x86/pmap.c   Fri Sep 03 10:27:33 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.334.2.5 2020/09/03 13:45:24 martin Exp $    */
+/*     $NetBSD: pmap.c,v 1.334.2.6 2021/09/03 10:27:33 martin Exp $    */
 
 /*
  * Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.334.2.5 2020/09/03 13:45:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.334.2.6 2021/09/03 10:27:33 martin Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -806,6 +806,7 @@
 void
 pat_init(struct cpu_info *ci)
 {
+#ifndef XENPV
        uint64_t pat;
 
        if (!(ci->ci_feat_val[0] & CPUID_PAT))
@@ -819,6 +820,7 @@
 
        wrmsr(MSR_CR_PAT, pat);
        cpu_pat_enabled = true;
+#endif
 }
 
 static pt_entry_t