renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 15:13:55 +08:00
Code

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

Browse Source 
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>
This commit is contained in:
Ingo Molnar 2015-09-05 09:32:40 +02:00
parent 530e5c8271
commit db1e031401
3 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/sigframe.h
View File

@ -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 */

2
arch/x86/include/uapi/asm/sigcontext.h
View File

@ -223,6 +223,8 @@ struct sigcontext_32 {
__u32 cr2;
};
#define sigcontext_ia32 sigcontext_32
struct sigcontext_64 {
__u64 r8;
__u64 r9;

26
arch/x86/include/uapi/asm/sigcontext32.h
View File

@ -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 */