tooling headers: Synchronize updated s390 kvm UAPI headers
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 9a3853587c2bb0a38c2ce80a613ace5e84ae4337 Gitweb: https://git.kernel.org/tip/9a3853587c2bb0a38c2ce80a613ace5e84ae4337 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Fri, 2 Feb 2018 16:43:45 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 2 Feb 2018 16:43:45 -0300
tooling headers: Synchronize updated s390 kvm UAPI headers
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 <[email protected]>
Cc Christian Borntraeger <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Radim Krčmář <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/arch/s390/include/uapi/asm/kvm.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/arch/s390/include/uapi/asm/kvm.h +4 -1
@@ -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 {