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

Commit b829d1be authored by Brian Gerst's avatar Brian Gerst Committed by Ingo Molnar
Browse files

x86/compat: Move ucontext_x32 to sigframe.h 



ia32.h should only contain the code for 32-bit compatability.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1434974121-32575-4-git-send-email-brgerst@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent b2e02b82

arch/x86/include/asm/ia32.h

+0 −9
Original line number Diff line number Diff line
@@ -22,15 +22,6 @@ struct ucontext_ia32 { 
	compat_sigset_t	  uc_sigmask;	/* mask last for extensibility */

};



struct ucontext_x32 {

	unsigned int	  uc_flags;

	unsigned int 	  uc_link;

	compat_stack_t	  uc_stack;

	unsigned int	  uc__pad0;     /* needed for alignment */

	struct sigcontext uc_mcontext;  /* the 64-bit sigcontext type */

	compat_sigset_t	  uc_sigmask;	/* mask last for extensibility */

};



/* This matches struct stat64 in glibc2.2, hence the absolutely

 * insane amounts of padding around dev_t's.

 */

arch/x86/include/asm/sigframe.h

+10 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <asm/sigcontext.h>

#include <asm/siginfo.h>

#include <asm/ucontext.h>

#include <linux/compat.h>



#ifdef CONFIG_X86_32

#define sigframe_ia32		sigframe
@@ -69,6 +70,15 @@ struct rt_sigframe { 


#ifdef CONFIG_X86_X32_ABI



struct ucontext_x32 {

	unsigned int	  uc_flags;

	unsigned int 	  uc_link;

	compat_stack_t	  uc_stack;

	unsigned int	  uc__pad0;     /* needed for alignment */

	struct sigcontext uc_mcontext;  /* the 64-bit sigcontext type */

	compat_sigset_t	  uc_sigmask;	/* mask last for extensibility */

};



struct rt_sigframe_x32 {

	u64 pretcode;

	struct ucontext_x32 uc;