These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / x86 / include / asm / sigframe.h

diff --git a/kernel/arch/x86/include/asm/sigframe.h b/kernel/arch/x86/include/asm/sigframe.h
index 7c7c27c..34edd16 100644 (file)
--- a/kernel/arch/x86/include/asm/sigframe.h
+++ b/kernel/arch/x86/include/asm/sigframe.h
@@ -1,15 +1,14 @@
 #ifndef _ASM_X86_SIGFRAME_H
 #define _ASM_X86_SIGFRAME_H
 
-#include <asm/sigcontext.h>
+#include <uapi/asm/sigcontext.h>
 #include <asm/siginfo.h>
 #include <asm/ucontext.h>
+#include <linux/compat.h>
 
 #ifdef CONFIG_X86_32
 #define sigframe_ia32          sigframe
 #define rt_sigframe_ia32       rt_sigframe
-#define sigcontext_ia32                sigcontext
-#define _fpstate_ia32          _fpstate
 #define ucontext_ia32          ucontext
 #else /* !CONFIG_X86_32 */
 
@@ -23,7 +22,7 @@
 struct sigframe_ia32 {
        u32 pretcode;
        int sig;
-       struct sigcontext_ia32 sc;
+       struct sigcontext_32 sc;
        /*
         * fpstate is unused. fpstate is moved/allocated after
         * retcode[] below. This movement allows to have the FP state and the
@@ -32,7 +31,7 @@ struct sigframe_ia32 {
         * the offset of extramask[] in the sigframe and thus prevent any
         * legacy application accessing/modifying it.
         */
-       struct _fpstate_ia32 fpstate_unused;
+       struct _fpstate_32 fpstate_unused;
 #ifdef CONFIG_IA32_EMULATION
        unsigned int extramask[_COMPAT_NSIG_WORDS-1];
 #else /* !CONFIG_IA32_EMULATION */
@@ -69,6 +68,15 @@ struct rt_sigframe {
 
 #ifdef CONFIG_X86_X32_ABI
 
+struct ucontext_x32 {
+       unsigned int      uc_flags;
+       unsigned int      uc_link;
+       compat_stack_t    uc_stack;
+       unsigned int      uc__pad0;     /* needed for alignment */
+       struct sigcontext uc_mcontext;  /* the 64-bit sigcontext type */
+       compat_sigset_t   uc_sigmask;   /* mask last for extensibility */
+};
+
 struct rt_sigframe_x32 {
        u64 pretcode;
        struct ucontext_x32 uc;