diff options
| author | David S. Miller <davem@davemloft.net> | 2018-09-18 09:33:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-18 09:33:27 -0700 |
| commit | e366fa435032db1ce1538a2c029714666985dd48 (patch) | |
| tree | d08bab02ba212339e4cfc0f2e3666435dd795b90 /tools/arch/arm/include/uapi/asm | |
| parent | cf7d97e1e54d71679a8b11716dad9d21deb0e1e2 (diff) | |
| parent | 5211da9ca526a5adddee1ccd078e6e33a583ab36 (diff) | |
| download | linux-e366fa435032db1ce1538a2c029714666985dd48.tar.gz linux-e366fa435032db1ce1538a2c029714666985dd48.tar.bz2 linux-e366fa435032db1ce1538a2c029714666985dd48.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Two new tls tests added in parallel in both net and net-next.
Used Stephen Rothwell's linux-next resolution.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/arch/arm/include/uapi/asm')
| -rw-r--r-- | tools/arch/arm/include/uapi/asm/kvm.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tools/arch/arm/include/uapi/asm/kvm.h b/tools/arch/arm/include/uapi/asm/kvm.h index 16e006f708ca..4602464ebdfb 100644 --- a/tools/arch/arm/include/uapi/asm/kvm.h +++ b/tools/arch/arm/include/uapi/asm/kvm.h @@ -27,6 +27,7 @@ #define __KVM_HAVE_GUEST_DEBUG #define __KVM_HAVE_IRQ_LINE #define __KVM_HAVE_READONLY_MEM +#define __KVM_HAVE_VCPU_EVENTS #define KVM_COALESCED_MMIO_PAGE_OFFSET 1 @@ -125,6 +126,18 @@ struct kvm_sync_regs { struct kvm_arch_memory_slot { }; +/* for KVM_GET/SET_VCPU_EVENTS */ +struct kvm_vcpu_events { + struct { + __u8 serror_pending; + __u8 serror_has_esr; + /* Align it to 8 bytes */ + __u8 pad[6]; + __u64 serror_esr; + } exception; + __u32 reserved[12]; +}; + /* If you need to interpret the index values, here is the key: */ #define KVM_REG_ARM_COPROC_MASK 0x000000000FFF0000 #define KVM_REG_ARM_COPROC_SHIFT 16 |