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

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

diff --git a/kernel/arch/x86/include/asm/ia32.h b/kernel/arch/x86/include/asm/ia32.h
index d0e8e01..a9bdf55 100644 (file)
--- a/kernel/arch/x86/include/asm/ia32.h
+++ b/kernel/arch/x86/include/asm/ia32.h
@@ -10,7 +10,7 @@
  * 32 bit structures for IA32 support.
  */
 
-#include <asm/sigcontext32.h>
+#include <uapi/asm/sigcontext.h>
 
 /* signal.h */
 
@@ -18,16 +18,7 @@ struct ucontext_ia32 {
        unsigned int      uc_flags;
        unsigned int      uc_link;
        compat_stack_t    uc_stack;
-       struct sigcontext_ia32 uc_mcontext;
-       compat_sigset_t   uc_sigmask;   /* mask last for extensibility */
-};
-
-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 */
+       struct sigcontext_32 uc_mcontext;
        compat_sigset_t   uc_sigmask;   /* mask last for extensibility */
 };