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

x86: signal: prepare to include from ia32_signal.c

Browse Source 
Impact: cleanup, prepare to use from ia32_signal.c

Make struct sigframe_ia32 and rt_sigframe_ia32 visible to ia32_signal.c.

Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Hiroshi Shimamoto
2008-12-17 18:51:08 -08:00
committed by Ingo Molnar
parent 41af86fad3
commit c85c2ff877
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,15 @@
#define sigcontext_ia32 sigcontext #define sigcontext_ia32 sigcontext
#define _fpstate_ia32 _fpstate #define _fpstate_ia32 _fpstate
#define ucontext_ia32 ucontext #define ucontext_ia32 ucontext
#else /* !CONFIG_X86_32 */
#ifdef CONFIG_IA32_EMULATION
#include <asm/ia32.h>
#endif /* CONFIG_IA32_EMULATION */
#endif /* CONFIG_X86_32 */
#if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION)
struct sigframe_ia32 { struct sigframe_ia32 {
u32 pretcode; u32 pretcode;
int sig; int sig;
@@ -18,7 +26,11 @@ struct sigframe_ia32 {
* legacy application accessing/modifying it. * legacy application accessing/modifying it.
*/ */
struct _fpstate_ia32 fpstate_unused; struct _fpstate_ia32 fpstate_unused;
#ifdef CONFIG_IA32_EMULATION
unsigned int extramask[_COMPAT_NSIG_WORDS-1];
#else /* !CONFIG_IA32_EMULATION */
unsigned long extramask[_NSIG_WORDS-1]; unsigned long extramask[_NSIG_WORDS-1];
#endif /* CONFIG_IA32_EMULATION */
char retcode[8]; char retcode[8];
/* fp state follows here */ /* fp state follows here */
}; };
@@ -28,16 +40,22 @@ struct rt_sigframe_ia32 {
int sig; int sig;
u32 pinfo; u32 pinfo;
u32 puc; u32 puc;
#ifdef CONFIG_IA32_EMULATION
compat_siginfo_t info;
#else /* !CONFIG_IA32_EMULATION */
struct siginfo info; struct siginfo info;
#endif /* CONFIG_IA32_EMULATION */
struct ucontext_ia32 uc; struct ucontext_ia32 uc;
char retcode[8]; char retcode[8];
/* fp state follows here */ /* fp state follows here */
}; };
#else /* !CONFIG_X86_32 */ #endif /* defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION) */
#ifdef CONFIG_X86_64
struct rt_sigframe { struct rt_sigframe {
char __user *pretcode; char __user *pretcode;
struct ucontext uc; struct ucontext uc;
struct siginfo info; struct siginfo info;
/* fp state follows here */ /* fp state follows here */
}; };
#endif /* CONFIG_X86_32 */ #endif /* CONFIG_X86_64 */