[src/trunk]: src/sys/dev/nvmm/x86 Fix definition for MWAIT. It should be bit ...

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

details:   https://anonhg.NetBSD.org/src/rev/e82ab32bc7f2
branches:  trunk
changeset: 455011:e82ab32bc7f2
user:      maxv <maxv%NetBSD.org@localhost>
date:      Fri Oct 04 12:15:21 2019 +0000

description:
Fix definition for MWAIT. It should be bit 11, not 12; 12 is the armed
version.

diffstat:

 sys/dev/nvmm/x86/nvmm_x86_svm.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 19b65b6d032d -r e82ab32bc7f2 sys/dev/nvmm/x86/nvmm_x86_svm.c
--- a/sys/dev/nvmm/x86/nvmm_x86_svm.c   Fri Oct 04 12:12:47 2019 +0000
+++ b/sys/dev/nvmm/x86/nvmm_x86_svm.c   Fri Oct 04 12:15:21 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvmm_x86_svm.c,v 1.47 2019/10/04 12:11:38 maxv Exp $   */
+/*     $NetBSD: nvmm_x86_svm.c,v 1.48 2019/10/04 12:15:21 maxv Exp $   */
 
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.47 2019/10/04 12:11:38 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.48 2019/10/04 12:15:21 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -287,7 +287,8 @@
 #define VMCB_CTRL_INTERCEPT_ICEBP      __BIT(8)
 #define VMCB_CTRL_INTERCEPT_WBINVD     __BIT(9)
 #define VMCB_CTRL_INTERCEPT_MONITOR    __BIT(10)
-#define VMCB_CTRL_INTERCEPT_MWAIT      __BIT(12)
+#define VMCB_CTRL_INTERCEPT_MWAIT      __BIT(11)
+#define VMCB_CTRL_INTERCEPT_MWAIT_ARMED        __BIT(12)
 #define VMCB_CTRL_INTERCEPT_XSETBV     __BIT(13)
 #define VMCB_CTRL_INTERCEPT_RDPRU      __BIT(14)
 #define VMCB_CTRL_INTERCEPT_EFER_SPEC  __BIT(15)