From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
"Arnaldo Carvalho de Melo" <acme@redhat.com>,
"Adrian Hunter" <adrian.hunter@intel.com>,
"Christian Borntraeger" <borntraeger@de.ibm.com>,
"David Ahern" <dsahern@gmail.com>, "Jiri Olsa" <jolsa@kernel.org>,
"Namhyung Kim" <namhyung@kernel.org>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Wang Nan" <wangnan0@huawei.com>
Subject: [PATCH 02/10] tooling headers: Synchronize updated s390 kvm UAPI headers
Date: Mon, 5 Feb 2018 16:56:12 -0300 [thread overview]
Message-ID: <20180205195620.9010-3-acme@kernel.org> (raw)
In-Reply-To: <20180205195620.9010-1-acme@kernel.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
The 35b3fde6203b ("KVM: s390: wire up bpb feature") was noticed by the
perf build process:
Warning: Kernel ABI header at 'tools/arch/s390/include/uapi/asm/kvm.h' differs from latest version at 'arch/s390/include/uapi/asm/kvm.h'
The changes in this cset don't cause or require changes in tools/perf/,
so just update the copy to silence the build warning.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
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-kif2fdkcaewj8iqw6lwyil8s@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/arch/s390/include/uapi/asm/kvm.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/arch/s390/include/uapi/asm/kvm.h b/tools/arch/s390/include/uapi/asm/kvm.h
index 38535a57fef8..4cdaa55fabfe 100644
--- a/tools/arch/s390/include/uapi/asm/kvm.h
+++ b/tools/arch/s390/include/uapi/asm/kvm.h
@@ -224,6 +224,7 @@ struct kvm_guest_debug_arch {
#define KVM_SYNC_RICCB (1UL << 7)
#define KVM_SYNC_FPRS (1UL << 8)
#define KVM_SYNC_GSCB (1UL << 9)
+#define KVM_SYNC_BPBC (1UL << 10)
/* length and alignment of the sdnx as a power of two */
#define SDNXC 8
#define SDNXL (1UL << SDNXC)
@@ -247,7 +248,9 @@ struct kvm_sync_regs {
};
__u8 reserved[512]; /* for future vector expansion */
__u32 fpc; /* valid on KVM_SYNC_VRS or KVM_SYNC_FPRS */
- __u8 padding1[52]; /* riccb needs to be 64byte aligned */
+ __u8 bpbc : 1; /* bp mode */
+ __u8 reserved2 : 7;
+ __u8 padding1[51]; /* riccb needs to be 64byte aligned */
__u8 riccb[64]; /* runtime instrumentation controls block */
__u8 padding2[192]; /* sdnx needs to be 256byte aligned */
union {
--
2.14.3
next prev parent reply other threads:[~2018-02-05 19:56 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-05 19:56 [GIT PULL 00/10] perf/urgent fixes Arnaldo Carvalho de Melo
2018-02-05 19:56 ` [PATCH 01/10] tools headers: Synchronize sound/asound.h Arnaldo Carvalho de Melo
2018-02-05 19:56 ` Arnaldo Carvalho de Melo [this message]
2018-02-06 8:42 ` [PATCH 02/10] tooling headers: Synchronize updated s390 kvm UAPI headers Christian Borntraeger
2018-02-06 10:53 ` Ingo Molnar
2018-02-05 19:56 ` [PATCH 03/10] tools headers: Sync {tools/,}arch/powerpc/include/uapi/asm/kvm.h Arnaldo Carvalho de Melo
2018-02-05 19:56 ` [PATCH 04/10] tools headers: Synchronize uapi/linux/sched.h Arnaldo Carvalho de Melo
2018-02-05 19:56 ` [PATCH 05/10] tools headers: Synchoronize x86 features UAPI headers Arnaldo Carvalho de Melo
2018-02-06 10:10 ` David Woodhouse
2018-02-06 10:54 ` Ingo Molnar
2018-02-05 19:56 ` [PATCH 06/10] perf evsel: Fix period/freq terms setup Arnaldo Carvalho de Melo
2018-02-05 19:56 ` [PATCH 07/10] perf record: Fix period option handling Arnaldo Carvalho de Melo
2018-02-05 19:56 ` [PATCH 08/10] x86/events/intel/ds: Add PERF_SAMPLE_PERIOD into PEBS_FREERUNNING_FLAGS Arnaldo Carvalho de Melo
2018-02-05 19:56 ` [PATCH 09/10] perf trace: Fix call-graph output Arnaldo Carvalho de Melo
2018-02-05 19:56 ` [PATCH 10/10] perf tools: Add trace/beauty/generated/ into .gitignore Arnaldo Carvalho de Melo
2018-02-05 21:28 ` [GIT PULL 00/10] 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=20180205195620.9010-3-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=borntraeger@de.ibm.com \
--cc=dsahern@gmail.com \
--cc=jolsa@kernel.org \
--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 \
/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).