diff mbox series

[v13,05/12] linux-headers: sync against Linux v4.14-rc8

Message ID 1511808595-24158-6-git-send-email-gengdongjiu@huawei.com
State New
Headers show
Series None | expand

Commit Message

Dongjiu Geng Nov. 27, 2017, 6:49 p.m. UTC 
Signed-off-by: Dongjiu Geng <gengdongjiu@huawei.com>
---
Address Peter's comments to sync mainline Linux header file in [1]
Address Michael's comments to not sync SPDX from Linux kernel header file

[1]: https://lkml.org/lkml/2017/9/5/575
---
 linux-headers/linux/kvm.h | 3 +++
 1 file changed, 3 insertions(+)
diff mbox series

Patch

diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
index 7971a4f..06a217f 100644
--- a/linux-headers/linux/kvm.h
+++ b/linux-headers/linux/kvm.h
@@ -929,6 +929,7 @@  struct kvm_ppc_resize_hpt {
 #define KVM_CAP_PPC_SMT_POSSIBLE 147
 #define KVM_CAP_HYPERV_SYNIC2 148
 #define KVM_CAP_HYPERV_VP_INDEX 149
+#define KVM_CAP_ARM_INJECT_SERROR_ESR 150
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
@@ -1355,6 +1356,8 @@  struct kvm_s390_ucas_mapping {
 /* Available with KVM_CAP_S390_CMMA_MIGRATION */
 #define KVM_S390_GET_CMMA_BITS      _IOWR(KVMIO, 0xb8, struct kvm_s390_cmma_log)
 #define KVM_S390_SET_CMMA_BITS      _IOW(KVMIO, 0xb9, struct kvm_s390_cmma_log)
+/* Available with KVM_CAP_ARM_INJECT_SERROR_ESR */
+#define KVM_ARM_INJECT_SERROR_ESR       _IOW(KVMIO,  0xba, __u32)
 
 #define KVM_DEV_ASSIGN_ENABLE_IOMMU	(1 << 0)
 #define KVM_DEV_ASSIGN_PCI_2_3		(1 << 1)