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 <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Brian Gerst <[email protected]>
Cc: Denys Vlasenko <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Oleg Nesterov <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/arch/x86/include/asm/sigframe.h b/arch/x86/include/asm/sigframe.h
index 5ff020a65e1b4338ea33904899af42a2e71627ab..98f04018663a0b129cfbff610a7f060c97565fa6 100644 (file)
--- 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 d0def259d5459bc505327368963e6c1695d01362..592bfafd5cb2f4c0506b7068b7841dbcd8791739 100644 (file)
--- 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 06c749b402633e057d59e16f4907baa8347746eb..257fbb3baaa7e0bfe649e00c19960800ef2c5dfd 100644 (file)
--- 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 */