From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: "Clark Williams" <williams@redhat.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
"Arnaldo Carvalho de Melo" <acme@redhat.com>,
"Adrian Hunter" <adrian.hunter@intel.com>,
"David Ahern" <dsahern@gmail.com>, "Jiri Olsa" <jolsa@kernel.org>,
"KarimAllah Ahmed" <karahmed@amazon.de>,
"Namhyung Kim" <namhyung@kernel.org>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Wang Nan" <wangnan0@huawei.com>
Subject: [PATCH 4/6] tools headers kvm: Sync uapi/linux/kvm.h with the kernel sources
Date: Mon, 7 May 2018 17:13:31 -0300 [thread overview]
Message-ID: <20180507201333.26990-5-acme@kernel.org> (raw)
In-Reply-To: <20180507201333.26990-1-acme@kernel.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
The changes in 5e62493f1a70 ("x86/headers/UAPI: Move DISABLE_EXITS KVM
capability bits to the UAPI") do not requires changes in the tooling nor
will trigger the automatic update of used ioctl string tables, copy it
to silence this build warning:
Warning: Kernel ABI header at 'tools/include/uapi/linux/kvm.h' differs from latest version at 'include/uapi/linux/kvm.h'
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: KarimAllah Ahmed <karahmed@amazon.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-8o5auh1lqglsgl1q97x00tlv@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/include/uapi/linux/kvm.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h
index 1065006c9bf5..b02c41e53d56 100644
--- a/tools/include/uapi/linux/kvm.h
+++ b/tools/include/uapi/linux/kvm.h
@@ -676,6 +676,13 @@ struct kvm_ioeventfd {
__u8 pad[36];
};
+#define KVM_X86_DISABLE_EXITS_MWAIT (1 << 0)
+#define KVM_X86_DISABLE_EXITS_HTL (1 << 1)
+#define KVM_X86_DISABLE_EXITS_PAUSE (1 << 2)
+#define KVM_X86_DISABLE_VALID_EXITS (KVM_X86_DISABLE_EXITS_MWAIT | \
+ KVM_X86_DISABLE_EXITS_HTL | \
+ KVM_X86_DISABLE_EXITS_PAUSE)
+
/* for KVM_ENABLE_CAP */
struct kvm_enable_cap {
/* in */
--
2.14.3
next prev parent reply other threads:[~2018-05-07 20:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-07 20:13 [GIT PULL 0/6] perf/urgent fixes Arnaldo Carvalho de Melo
2018-05-07 20:13 ` [PATCH 1/6] perf bench numa: Fix typo in options Arnaldo Carvalho de Melo
2018-05-07 20:13 ` [PATCH 2/6] perf vendor events intel: Remove duplicated entry for westmereep-dp in mapfile.csv Arnaldo Carvalho de Melo
2018-05-07 20:13 ` [PATCH 3/6] tools headers: Sync x86 cpufeatures.h with the kernel sources Arnaldo Carvalho de Melo
2018-05-07 20:13 ` Arnaldo Carvalho de Melo [this message]
2018-05-07 20:13 ` [PATCH 5/6] tools headers kvm: Sync ARM UAPI headers " Arnaldo Carvalho de Melo
2018-05-07 20:13 ` [PATCH 6/6] Revert "perf pmu: Fix pmu events parsing rule" Arnaldo Carvalho de Melo
2018-05-10 18:10 ` [GIT PULL 0/6] perf/urgent fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180507201333.26990-5-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=dsahern@gmail.com \
--cc=jolsa@kernel.org \
--cc=karahmed@amazon.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=rkrcmar@redhat.com \
--cc=wangnan0@huawei.com \
--cc=williams@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).