2 files changed, 3 insertions, 0 deletions

diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
index b59ee077a596..8c6d3bdb9a00 100644
--- a/include/uapi/linux/elf.h
+++ b/include/uapi/linux/elf.h
@@ -409,6 +409,7 @@ typedef struct elf64_shdr {
 #define NT_S390_TDB     0x308           /* s390 transaction diagnostic block */
 #define NT_S390_VXRS_LOW        0x309   /* s390 vector registers 0-15 upper half */
 #define NT_S390_VXRS_HIGH       0x30a   /* s390 vector registers 16-31 */
+#define NT_S390_GS_CB   0x30b           /* s390 guarded storage registers */
 #define NT_ARM_VFP      0x400           /* ARM VFP/NEON registers */
 #define NT_ARM_TLS      0x401           /* ARM TLS register */
 #define NT_ARM_HW_BREAK 0x402           /* ARM hardware breakpoint registers */
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 1e1a6c728a18..6180ea50e9ef 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -890,6 +890,8 @@ struct kvm_ppc_resize_hpt {
 #define KVM_CAP_MIPS_VZ 137
 #define KVM_CAP_MIPS_TE 138
 #define KVM_CAP_MIPS_64BIT 139
+#define KVM_CAP_S390_GS 140
+#define KVM_CAP_S390_AIS 141
 
 #ifdef KVM_CAP_IRQ_ROUTING