Module Name: src
Committed By: martin
Date: Sat Nov 16 20:08:45 UTC 2019
Modified Files:
src/sys/dev/nvmm/x86 [netbsd-9]: nvmm_x86.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/dev/nvmm/x86/nvmm_x86.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/dev/nvmm/x86/nvmm_x86.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86.c:1.7 src/sys/dev/nvmm/x86/nvmm_x86.c:1.7.4.1
--- src/sys/dev/nvmm/x86/nvmm_x86.c:1.7 Wed May 15 04:39:52 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86.c Sat Nov 16 20:08:45 2019
@@ -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 @@ const struct nvmm_x86_cpuid_mask nvmm_cp
.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 @@ const struct nvmm_x86_cpuid_mask nvmm_cp
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 |
