x86/headers: Unify 'struct sigcontext_ia32' and 'struct sigcontext_32'

The two structures are identical - merge them and keep the
legacy name as a define.

Acked-by: Mikko Rapeli <mikko.rapeli@iki.fi>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/1441438363-9999-13-git-send-email-mingo@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

3 files changed, 2 insertions, 27 deletions

diff --git a/arch/x86/include/asm/sigframe.h b/arch/x86/include/asm/sigframe.h
index 5ff020a65e1b..98f04018663a 100644
--- a/arch/x86/include/asm/sigframe.h
+++ b/arch/x86/include/asm/sigframe.h
@@ -9,7 +9,6 @@
 #ifdef CONFIG_X86_32
 #define sigframe_ia32           sigframe
 #define rt_sigframe_ia32        rt_sigframe
-#define sigcontext_ia32         sigcontext
 #define ucontext_ia32           ucontext
 #else /* !CONFIG_X86_32 */
 
diff --git a/arch/x86/include/uapi/asm/sigcontext.h b/arch/x86/include/uapi/asm/sigcontext.h
index d0def259d545..592bfafd5cb2 100644
--- a/arch/x86/include/uapi/asm/sigcontext.h
+++ b/arch/x86/include/uapi/asm/sigcontext.h
@@ -223,6 +223,8 @@ struct sigcontext_32 {
         __u32                           cr2;
 };
 
+#define sigcontext_ia32 sigcontext_32
+
 struct sigcontext_64 {
         __u64                           r8;
         __u64                           r9;
diff --git a/arch/x86/include/uapi/asm/sigcontext32.h b/arch/x86/include/uapi/asm/sigcontext32.h
index 06c749b40263..257fbb3baaa7 100644
--- a/arch/x86/include/uapi/asm/sigcontext32.h
+++ b/arch/x86/include/uapi/asm/sigcontext32.h
@@ -5,30 +5,4 @@
 
 #include <asm/sigcontext.h>
 
-/* 32-bit compat sigcontext: */
-struct sigcontext_ia32 {
-       __u16                            gs, __gsh;
-       __u16                            fs, __fsh;
-       __u16                            es, __esh;
-       __u16                            ds, __dsh;
-       __u32                            di;
-       __u32                            si;
-       __u32                            bp;
-       __u32                            sp;
-       __u32                            bx;
-       __u32                            dx;
-       __u32                            cx;
-       __u32                            ax;
-       __u32                            trapno;
-       __u32                            err;
-       __u32                            ip;
-       __u16                            cs, __csh;
-       __u32                            flags;
-       __u32                            sp_at_signal;
-       __u16                            ss, __ssh;
-       __u32                            fpstate;        /* Pointer to 'struct _fpstate_32' */
-       __u32                            oldmask;
-       __u32                            cr2;
-};
-
 #endif /* _ASM_X86_SIGCONTEXT32_H */