3 files changed, 30 insertions, 9 deletions

diff --git a/arch/s390/include/uapi/asm/sigcontext.h b/arch/s390/include/uapi/asm/sigcontext.h
index b30de9c01bbe..5f0b8d7ddb0b 100644
--- a/arch/s390/include/uapi/asm/sigcontext.h
+++ b/arch/s390/include/uapi/asm/sigcontext.h
@@ -7,10 +7,14 @@
 #define _ASM_S390_SIGCONTEXT_H
 
 #include <linux/compiler.h>
+#include <linux/types.h>
 
-#define __NUM_GPRS 16
-#define __NUM_FPRS 16
-#define __NUM_ACRS 16
+#define __NUM_GPRS              16
+#define __NUM_FPRS              16
+#define __NUM_ACRS              16
+#define __NUM_VXRS              32
+#define __NUM_VXRS_LOW          16
+#define __NUM_VXRS_HIGH         16
 
 #ifndef __s390x__
 
@@ -59,6 +63,16 @@ typedef struct
         _s390_fp_regs     fpregs;
 } _sigregs;
 
+typedef struct
+{
+#ifndef __s390x__
+        unsigned long gprs_high[__NUM_GPRS];
+#endif
+        unsigned long long vxrs_low[__NUM_VXRS_LOW];
+        __vector128 vxrs_high[__NUM_VXRS_HIGH];
+        unsigned char __reserved[128];
+} _sigregs_ext;
+
 struct sigcontext
 {
         unsigned long   oldmask[_SIGCONTEXT_NSIG_WORDS];
diff --git a/arch/s390/include/uapi/asm/types.h b/arch/s390/include/uapi/asm/types.h
index 038f2b9178a4..3c3951e3415b 100644
--- a/arch/s390/include/uapi/asm/types.h
+++ b/arch/s390/include/uapi/asm/types.h
@@ -17,6 +17,10 @@
 typedef unsigned long addr_t; 
 typedef __signed__ long saddr_t;
 
+typedef struct {
+        __u32 u[4];
+} __vector128;
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* _UAPI_S390_TYPES_H */
diff --git a/arch/s390/include/uapi/asm/ucontext.h b/arch/s390/include/uapi/asm/ucontext.h
index 3e077b2a4705..64a69aa5dde0 100644
--- a/arch/s390/include/uapi/asm/ucontext.h
+++ b/arch/s390/include/uapi/asm/ucontext.h
@@ -7,10 +7,15 @@
 #ifndef _ASM_S390_UCONTEXT_H
 #define _ASM_S390_UCONTEXT_H
 
-#define UC_EXTENDED     0x00000001
-
-#ifndef __s390x__
+#define UC_GPRS_HIGH    1       /* uc_mcontext_ext has valid high gprs */
+#define UC_VXRS         2       /* uc_mcontext_ext has valid vector regs */
 
+/*
+ * The struct ucontext_extended describes how the registers are stored
+ * on a rt signal frame. Please note that the structure is not fixed,
+ * if new CPU registers are added to the user state the size of the
+ * struct ucontext_extended will increase.
+ */
 struct ucontext_extended {
         unsigned long     uc_flags;
         struct ucontext  *uc_link;
@@ -19,11 +24,9 @@ struct ucontext_extended {
         sigset_t          uc_sigmask;
         /* Allow for uc_sigmask growth.  Glibc uses a 1024-bit sigset_t.  */
         unsigned char     __unused[128 - sizeof(sigset_t)];
-        unsigned long     uc_gprs_high[16];
+        _sigregs_ext      uc_mcontext_ext;
 };
 
-#endif
-
 struct ucontext {
         unsigned long     uc_flags;
         struct ucontext  *uc_link;