diff options
| author | Greg Kroah-Hartman | 2017-10-09 09:11:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-10-09 09:11:09 +0200 |
| commit | 4fcae770f3027abefd952c5d511ac6299828865a (patch) | |
| tree | 6cf64399a20f989358831a8f9b2ac2bb19628f54 /tools/arch/s390/include/uapi/asm/kvm.h | |
| parent | usb: host: xhci-plat: Use of_device_get_match_data() helper (diff) | |
| parent | Linux 4.14-rc4 (diff) | |
| download | kernel-qcow2-linux-4fcae770f3027abefd952c5d511ac6299828865a.tar.gz kernel-qcow2-linux-4fcae770f3027abefd952c5d511ac6299828865a.tar.xz kernel-qcow2-linux-4fcae770f3027abefd952c5d511ac6299828865a.zip | |
Merge 4.14-rc4 into usb-next
This merges in the USB fixes that we need here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/arch/s390/include/uapi/asm/kvm.h')
| -rw-r--r-- | tools/arch/s390/include/uapi/asm/kvm.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/arch/s390/include/uapi/asm/kvm.h b/tools/arch/s390/include/uapi/asm/kvm.h index 69d09c39bbcd..cd7359e23d86 100644 --- a/tools/arch/s390/include/uapi/asm/kvm.h +++ b/tools/arch/s390/include/uapi/asm/kvm.h @@ -88,6 +88,12 @@ struct kvm_s390_io_adapter_req { /* kvm attributes for KVM_S390_VM_TOD */ #define KVM_S390_VM_TOD_LOW 0 #define KVM_S390_VM_TOD_HIGH 1 +#define KVM_S390_VM_TOD_EXT 2 + +struct kvm_s390_vm_tod_clock { + __u8 epoch_idx; + __u64 tod; +}; /* kvm attributes for KVM_S390_VM_CPU_MODEL */ /* processor related attributes are r/w */ |