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

Commit 123a6347 authored by Harvey Harrison's avatar Harvey Harrison Committed by Ingo Molnar
Browse files

x86: move struct definitions to unifed sigframe.h 



[ tglx@linutronix.de: cleanup the other structs as well ]

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 2d19c458

arch/x86/kernel/asm-offsets_32.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/personality.h>

#include <linux/suspend.h>

#include <asm/ucontext.h>

#include "sigframe_32.h"

#include "sigframe.h"

#include <asm/pgtable.h>

#include <asm/fixmap.h>

#include <asm/processor.h>

arch/x86/kernel/sigframe_32.h→arch/x86/kernel/sigframe.h

+10 −4
Original line number Diff line number Diff line 
struct sigframe

{

#ifdef CONFIG_X86_32

struct sigframe {

	char __user *pretcode;

	int sig;

	struct sigcontext sc;
@@ -8,8 +8,7 @@ struct sigframe 
	char retcode[8];

};



struct rt_sigframe

{

struct rt_sigframe {

	char __user *pretcode;

	int sig;

	struct siginfo __user *pinfo;
@@ -19,3 +18,10 @@ struct rt_sigframe 
	struct _fpstate fpstate;

	char retcode[8];

};

#else

struct rt_sigframe {

	char __user *pretcode;

	struct ucontext uc;

	struct siginfo info;

};

#endif

arch/x86/kernel/signal_32.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <asm/uaccess.h>

#include <asm/i387.h>

#include <asm/vdso.h>

#include "sigframe_32.h"

#include "sigframe.h"



#define DEBUG_SIG 0

arch/x86/kernel/signal_64.c

+1 −8
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/proto.h>

#include <asm/ia32_unistd.h>

#include <asm/mce.h>

#include "sigframe.h"



/* #define DEBUG_SIG 1 */
@@ -58,14 +59,6 @@ sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, 
/*

 * Do a signal return; undo the signal stack.

 */



struct rt_sigframe

{

	char __user *pretcode;

	struct ucontext uc;

	struct siginfo info;

};



static int

restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, unsigned long *prax)

{