diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-02-02 14:43:45 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-02-02 14:43:45 -0500 |
commit | 9a3853587c2bb0a38c2ce80a613ace5e84ae4337 (patch) | |
tree | ae1a707734493ff350ffdf075f668319dfb16270 | |
parent | 6bc7626c046e069ea4802f3fbc7a41059047ac77 (diff) |
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 <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>
-rw-r--r-- | tools/arch/s390/include/uapi/asm/kvm.h | 5 |
1 files changed, 4 insertions, 1 deletions
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 { | |||
224 | #define KVM_SYNC_RICCB (1UL << 7) | 224 | #define KVM_SYNC_RICCB (1UL << 7) |
225 | #define KVM_SYNC_FPRS (1UL << 8) | 225 | #define KVM_SYNC_FPRS (1UL << 8) |
226 | #define KVM_SYNC_GSCB (1UL << 9) | 226 | #define KVM_SYNC_GSCB (1UL << 9) |
227 | #define KVM_SYNC_BPBC (1UL << 10) | ||
227 | /* length and alignment of the sdnx as a power of two */ | 228 | /* length and alignment of the sdnx as a power of two */ |
228 | #define SDNXC 8 | 229 | #define SDNXC 8 |
229 | #define SDNXL (1UL << SDNXC) | 230 | #define SDNXL (1UL << SDNXC) |
@@ -247,7 +248,9 @@ struct kvm_sync_regs { | |||
247 | }; | 248 | }; |
248 | __u8 reserved[512]; /* for future vector expansion */ | 249 | __u8 reserved[512]; /* for future vector expansion */ |
249 | __u32 fpc; /* valid on KVM_SYNC_VRS or KVM_SYNC_FPRS */ | 250 | __u32 fpc; /* valid on KVM_SYNC_VRS or KVM_SYNC_FPRS */ |
250 | __u8 padding1[52]; /* riccb needs to be 64byte aligned */ | 251 | __u8 bpbc : 1; /* bp mode */ |
252 | __u8 reserved2 : 7; | ||
253 | __u8 padding1[51]; /* riccb needs to be 64byte aligned */ | ||
251 | __u8 riccb[64]; /* runtime instrumentation controls block */ | 254 | __u8 riccb[64]; /* runtime instrumentation controls block */ |
252 | __u8 padding2[192]; /* sdnx needs to be 256byte aligned */ | 255 | __u8 padding2[192]; /* sdnx needs to be 256byte aligned */ |
253 | union { | 256 | union { |