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

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

details:   https://anonhg.NetBSD.org/src/rev/74df686a14e6
branches:  netbsd-9
changeset: 461142:74df686a14e6
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Nov 16 20:08:45 2019 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #434):

        sys/dev/nvmm/x86/nvmm_x86.c: revision 1.8

Don't report MWAITX by default.

diffstat:

 sys/dev/nvmm/x86/nvmm_x86.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r fb5651958beb -r 74df686a14e6 sys/dev/nvmm/x86/nvmm_x86.c
--- a/sys/dev/nvmm/x86/nvmm_x86.c       Sat Nov 16 17:02:38 2019 +0000
+++ b/sys/dev/nvmm/x86/nvmm_x86.c       Sat Nov 16 20:08:45 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvmm_x86.c,v 1.7 2019/05/15 04:39:52 maxv Exp $        */
+/*     $NetBSD: nvmm_x86.c,v 1.7.4.1 2019/11/16 20:08:45 martin Exp $  */
 
 /*
  * Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86.c,v 1.7 2019/05/15 04:39:52 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86.c,v 1.7.4.1 2019/11/16 20:08:45 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -292,7 +292,7 @@
        .eax = ~0,
        .ebx = ~0,
        .ecx =
-           /* Excluded: SVM, EAPIC, OSVW. */
+           /* Excluded: SVM, EAPIC, OSVW, MWAITX. */
            CPUID_LAHF | CPUID_CMPLEGACY |
            CPUID_ALTMOVCR0 | CPUID_LZCNT |
            CPUID_SSE4A | CPUID_MISALIGNSSE |
@@ -304,7 +304,7 @@
            CPUID_TOPOEXT | CPUID_PCEC |
            CPUID_PCENB | CPUID_SPM |
            CPUID_DBE | CPUID_PTSC |
-           CPUID_L2IPERFC | CPUID_MWAITX,
+           CPUID_L2IPERFC,
        .edx =
            /* Excluded: RDTSCP. */
            CPUID_SYSCALL | CPUID_MPC |