Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fcb346b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/headers: Convert sigcontext_ia32 uses to sigcontext_32 



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: default avatarMikko 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: default avatarIngo Molnar <mingo@kernel.org>
parent db1e0314

arch/x86/ia32/ia32_signal.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
}



static int ia32_restore_sigcontext(struct pt_regs *regs,

				   struct sigcontext_ia32 __user *sc)

				   struct sigcontext_32 __user *sc)

{

	unsigned int tmpflags, err = 0;

	void __user *buf;
@@ -170,7 +170,7 @@ asmlinkage long sys32_rt_sigreturn(void) 
 * 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,

				 struct pt_regs *regs, unsigned int mask)

{

arch/x86/include/asm/ia32.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ struct ucontext_ia32 { 
	unsigned int	  uc_flags;

	unsigned int 	  uc_link;

	compat_stack_t	  uc_stack;

	struct sigcontext_ia32 uc_mcontext;

	struct sigcontext_32 uc_mcontext;

	compat_sigset_t	  uc_sigmask;	/* mask last for extensibility */

};

arch/x86/include/asm/sigframe.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
struct sigframe_ia32 {

	u32 pretcode;

	int sig;

	struct sigcontext_ia32 sc;

	struct sigcontext_32 sc;

	/*

	 * fpstate is unused. fpstate is moved/allocated after

	 * retcode[] below. This movement allows to have the FP state and the

arch/x86/include/uapi/asm/sigcontext.h

+9 −3
Original line number Diff line number Diff line
@@ -190,6 +190,9 @@ struct _xstate { 
	/* New processor state extensions go here: */

};



/*

 * The 32-bit signal frame:

 */

struct sigcontext_32 {

	__u16				gs, __gsh;

	__u16				fs, __fsh;
@@ -223,8 +226,9 @@ struct sigcontext_32 { 
	__u32				cr2;

};



#define sigcontext_ia32 sigcontext_32



/*

 * The 64-bit signal frame:

 */

struct sigcontext_64 {

	__u64				r8;

	__u64				r9;
@@ -283,6 +287,8 @@ struct sigcontext_64 { 
#ifndef __KERNEL__



#define _fpstate_ia32			_fpstate_32

#define sigcontext_ia32			sigcontext_32





# ifdef __i386__

struct sigcontext {

arch/x86/kernel/asm-offsets.c

+9 −9
Original line number Diff line number Diff line
@@ -43,15 +43,15 @@ void common(void) { 


#if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION)

	BLANK();

	OFFSET(IA32_SIGCONTEXT_ax, sigcontext_ia32, ax);

	OFFSET(IA32_SIGCONTEXT_bx, sigcontext_ia32, bx);

	OFFSET(IA32_SIGCONTEXT_cx, sigcontext_ia32, cx);

	OFFSET(IA32_SIGCONTEXT_dx, sigcontext_ia32, dx);

	OFFSET(IA32_SIGCONTEXT_si, sigcontext_ia32, si);

	OFFSET(IA32_SIGCONTEXT_di, sigcontext_ia32, di);

	OFFSET(IA32_SIGCONTEXT_bp, sigcontext_ia32, bp);

	OFFSET(IA32_SIGCONTEXT_sp, sigcontext_ia32, sp);

	OFFSET(IA32_SIGCONTEXT_ip, sigcontext_ia32, ip);

	OFFSET(IA32_SIGCONTEXT_ax, sigcontext_32, ax);

	OFFSET(IA32_SIGCONTEXT_bx, sigcontext_32, bx);

	OFFSET(IA32_SIGCONTEXT_cx, sigcontext_32, cx);

	OFFSET(IA32_SIGCONTEXT_dx, sigcontext_32, dx);

	OFFSET(IA32_SIGCONTEXT_si, sigcontext_32, si);

	OFFSET(IA32_SIGCONTEXT_di, sigcontext_32, di);

	OFFSET(IA32_SIGCONTEXT_bp, sigcontext_32, bp);

	OFFSET(IA32_SIGCONTEXT_sp, sigcontext_32, sp);

	OFFSET(IA32_SIGCONTEXT_ip, sigcontext_32, ip);



	BLANK();

	OFFSET(TI_sysenter_return, thread_info, sysenter_return);