FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-09 11:00:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

x86/headers: Convert sigcontext_ia32 uses to sigcontext_32

Browse Source 
Use the new name in kernel code, and move the old name to the
user-space-only legacy section of the UAPI header.

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-14-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:41 +02:00
parent db1e031401
commit 8fcb346b91
5 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/ia32/ia32_signal.c
View File

@ -68,7 +68,7 @@
} }
static int ia32_restore_sigcontext(struct pt_regs *regs, static int ia32_restore_sigcontext(struct pt_regs *regs,
struct sigcontext_ia32 __user *sc) struct sigcontext_32 __user *sc)
{ {
unsigned int tmpflags, err = 0; unsigned int tmpflags, err = 0;
void __user *buf; void __user *buf;
@ -170,7 +170,7 @@ badframe:
* Set up a signal frame. * Set up a signal frame.
*/ */
static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc, static int ia32_setup_sigcontext(struct sigcontext_32 __user *sc,
void __user *fpstate, void __user *fpstate,
struct pt_regs *regs, unsigned int mask) struct pt_regs *regs, unsigned int mask)
{ {

2
arch/x86/include/asm/ia32.h
View File

@ -18,7 +18,7 @@ struct ucontext_ia32 {
unsigned int uc_flags; unsigned int uc_flags;
unsigned int uc_link; unsigned int uc_link;
compat_stack_t uc_stack; compat_stack_t uc_stack;
struct sigcontext_ia32 uc_mcontext; struct sigcontext_32 uc_mcontext;
compat_sigset_t uc_sigmask; /* mask last for extensibility */ compat_sigset_t uc_sigmask; /* mask last for extensibility */
}; };

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

@ -22,7 +22,7 @@
struct sigframe_ia32 { struct sigframe_ia32 {
u32 pretcode; u32 pretcode;
int sig; int sig;
struct sigcontext_ia32 sc; struct sigcontext_32 sc;
/* /*
* fpstate is unused. fpstate is moved/allocated after * fpstate is unused. fpstate is moved/allocated after
* retcode[] below. This movement allows to have the FP state and the * retcode[] below. This movement allows to have the FP state and the

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

@ -190,6 +190,9 @@ struct _xstate {
/* New processor state extensions go here: */ /* New processor state extensions go here: */
}; };
/*
* The 32-bit signal frame:
*/
struct sigcontext_32 { struct sigcontext_32 {
__u16 gs, __gsh; __u16 gs, __gsh;
__u16 fs, __fsh; __u16 fs, __fsh;
@ -223,8 +226,9 @@ struct sigcontext_32 {
__u32 cr2; __u32 cr2;
}; };
#define sigcontext_ia32 sigcontext_32 /*
* The 64-bit signal frame:
*/
struct sigcontext_64 { struct sigcontext_64 {
__u64 r8; __u64 r8;
__u64 r9; __u64 r9;
@ -282,7 +286,9 @@ struct sigcontext_64 {
*/ */
#ifndef __KERNEL__ #ifndef __KERNEL__
#define _fpstate_ia32 _fpstate_32 #define _fpstate_ia32 _fpstate_32
#define sigcontext_ia32 sigcontext_32
# ifdef __i386__ # ifdef __i386__
struct sigcontext { struct sigcontext {

18
arch/x86/kernel/asm-offsets.c
View File

@ -43,15 +43,15 @@ void common(void) {
#if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION) #if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION)
BLANK(); BLANK();
OFFSET(IA32_SIGCONTEXT_ax, sigcontext_ia32, ax); OFFSET(IA32_SIGCONTEXT_ax, sigcontext_32, ax);
OFFSET(IA32_SIGCONTEXT_bx, sigcontext_ia32, bx); OFFSET(IA32_SIGCONTEXT_bx, sigcontext_32, bx);
OFFSET(IA32_SIGCONTEXT_cx, sigcontext_ia32, cx); OFFSET(IA32_SIGCONTEXT_cx, sigcontext_32, cx);
OFFSET(IA32_SIGCONTEXT_dx, sigcontext_ia32, dx); OFFSET(IA32_SIGCONTEXT_dx, sigcontext_32, dx);
OFFSET(IA32_SIGCONTEXT_si, sigcontext_ia32, si); OFFSET(IA32_SIGCONTEXT_si, sigcontext_32, si);
OFFSET(IA32_SIGCONTEXT_di, sigcontext_ia32, di); OFFSET(IA32_SIGCONTEXT_di, sigcontext_32, di);
OFFSET(IA32_SIGCONTEXT_bp, sigcontext_ia32, bp); OFFSET(IA32_SIGCONTEXT_bp, sigcontext_32, bp);
OFFSET(IA32_SIGCONTEXT_sp, sigcontext_ia32, sp); OFFSET(IA32_SIGCONTEXT_sp, sigcontext_32, sp);
OFFSET(IA32_SIGCONTEXT_ip, sigcontext_ia32, ip); OFFSET(IA32_SIGCONTEXT_ip, sigcontext_32, ip);
BLANK(); BLANK();
OFFSET(TI_sysenter_return, thread_info, sysenter_return); OFFSET(TI_sysenter_return, thread_info, sysenter_return);