x86/compat: Move ucontext_x32 to sigframe.h

ia32.h should only contain the code for 32-bit compatability.

Signed-off-by: Brian Gerst <brgerst@gmail.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1434974121-32575-4-git-send-email-brgerst@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h
index d0e8e01..2801976 100644 (file)
--- a/arch/x86/include/asm/ia32.h
+++ b/arch/x86/include/asm/ia32.h
@@ -22,15 +22,6 @@ struct ucontext_ia32 {
        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 */
-       compat_sigset_t   uc_sigmask;   /* mask last for extensibility */
-};
-
 /* This matches struct stat64 in glibc2.2, hence the absolutely
  * insane amounts of padding around dev_t's.
  */

diff --git a/arch/x86/include/asm/sigframe.h b/arch/x86/include/asm/sigframe.h
index 7c7c27c..1f3175b 100644 (file)
--- a/arch/x86/include/asm/sigframe.h
+++ b/arch/x86/include/asm/sigframe.h
@@ -4,6 +4,7 @@
 #include <asm/sigcontext.h>
 #include <asm/siginfo.h>
 #include <asm/ucontext.h>
+#include <linux/compat.h>
 
 #ifdef CONFIG_X86_32
 #define sigframe_ia32          sigframe
@@ -69,6 +70,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;