diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-04 08:23:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-04 08:23:03 +0200 |
| commit | c0554d2d3db438623b4f2f9abc3d766b2b15d2fb (patch) | |
| tree | d00dc324772b95373f4bdc566b3437e5bf637157 /tools/arch/s390/include | |
| parent | bef459026b161fbc39d20dcba698ed0cfffbac38 (diff) | |
| parent | 1d2ba7fee28b3a47cca8e8f4f94a22d30b2b3a6f (diff) | |
Merge branch 'linus' into x86/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/arch/s390/include')
| -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 4cdaa55fabfe..9a50f02b9894 100644 --- a/tools/arch/s390/include/uapi/asm/kvm.h +++ b/tools/arch/s390/include/uapi/asm/kvm.h @@ -4,7 +4,7 @@ /* * KVM s390 specific structures and definitions * - * Copyright IBM Corp. 2008 + * Copyright IBM Corp. 2008, 2018 * * Author(s): Carsten Otte <cotte@de.ibm.com> * Christian Borntraeger <borntraeger@de.ibm.com> @@ -225,6 +225,7 @@ struct kvm_guest_debug_arch { #define KVM_SYNC_FPRS (1UL << 8) #define KVM_SYNC_GSCB (1UL << 9) #define KVM_SYNC_BPBC (1UL << 10) +#define KVM_SYNC_ETOKEN (1UL << 11) /* length and alignment of the sdnx as a power of two */ #define SDNXC 8 #define SDNXL (1UL << SDNXC) @@ -258,6 +259,8 @@ struct kvm_sync_regs { struct { __u64 reserved1[2]; __u64 gscb[4]; + __u64 etoken; + __u64 etoken_extension; }; }; }; |