lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: move struct definitions to unifed sigframe.h

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

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Harvey Harrison
2008-02-08 12:10:00 -08:00
committed by Ingo Molnar
parent 2d19c45806
commit 123a63476c
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/asm-offsets_32.c
View File

@@ -10,7 +10,7 @@
#include <linux/personality.h> #include <linux/personality.h>
#include <linux/suspend.h> #include <linux/suspend.h>
#include <asm/ucontext.h> #include <asm/ucontext.h>
#include "sigframe_32.h" #include "sigframe.h"
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/fixmap.h> #include <asm/fixmap.h>
#include <asm/processor.h> #include <asm/processor.h>

14
arch/x86/kernel/sigframe_32.h → arch/x86/kernel/sigframe.h
View File

@@ -1,5 +1,5 @@
struct sigframe #ifdef CONFIG_X86_32
{ struct sigframe {
char __user *pretcode; char __user *pretcode;
int sig; int sig;
struct sigcontext sc; struct sigcontext sc;
@@ -8,8 +8,7 @@ struct sigframe
char retcode[8]; char retcode[8];
}; };
struct rt_sigframe struct rt_sigframe {
{
char __user *pretcode; char __user *pretcode;
int sig; int sig;
struct siginfo __user *pinfo; struct siginfo __user *pinfo;
@@ -19,3 +18,10 @@ struct rt_sigframe
struct _fpstate fpstate; struct _fpstate fpstate;
char retcode[8]; char retcode[8];
}; };
#else
struct rt_sigframe {
char __user *pretcode;
struct ucontext uc;
struct siginfo info;
};
#endif

2
arch/x86/kernel/signal_32.c
View File

@@ -24,7 +24,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/i387.h> #include <asm/i387.h>
#include <asm/vdso.h> #include <asm/vdso.h>
#include "sigframe_32.h" #include "sigframe.h"
#define DEBUG_SIG 0 #define DEBUG_SIG 0

9
arch/x86/kernel/signal_64.c
View File

@@ -26,6 +26,7 @@
#include <asm/proto.h> #include <asm/proto.h>
#include <asm/ia32_unistd.h> #include <asm/ia32_unistd.h>
#include <asm/mce.h> #include <asm/mce.h>
#include "sigframe.h"
/* #define DEBUG_SIG 1 */ /* #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. * Do a signal return; undo the signal stack.
*/ */
struct rt_sigframe
{
char __user *pretcode;
struct ucontext uc;
struct siginfo info;
};
static int static int
restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, unsigned long *prax) restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, unsigned long *prax)
{ {