Merge remote-tracking branch 'mips/mips-for-linux-next'

[karo-tx-linux.git] / arch / x86 / include / asm / ia32.h

diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h
index 28019765442e6092e8131f8ed01e43d783e0152c..a9bdf5569ab38a5e3a15d5f8bb0dc09b1d1e40ff 100644 (file)
--- a/arch/x86/include/asm/ia32.h
+++ b/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,7 +18,7 @@ struct ucontext_ia32 {
        unsigned int      uc_flags;
        unsigned int      uc_link;
        compat_stack_t    uc_stack;
-       struct sigcontext_ia32 uc_mcontext;
+       struct sigcontext_32 uc_mcontext;
        compat_sigset_t   uc_sigmask;   /* mask last for extensibility */
 };