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

Commit c85c2ff8 authored by Hiroshi Shimamoto's avatar Hiroshi Shimamoto Committed by Ingo Molnar
Browse files

x86: signal: prepare to include from ia32_signal.c 



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: default avatarHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 41af86fa

arch/x86/include/asm/sigframe.h

+20 −2
Original line number Diff line number Diff line
@@ -4,7 +4,15 @@ 
#define sigcontext_ia32		sigcontext

#define _fpstate_ia32		_fpstate

#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 {

	u32 pretcode;

	int sig;
@@ -18,7 +26,11 @@ struct sigframe_ia32 { 
	 * legacy application accessing/modifying it.

	 */

	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];

#endif /* CONFIG_IA32_EMULATION */

	char retcode[8];

	/* fp state follows here */

};
@@ -28,16 +40,22 @@ struct rt_sigframe_ia32 { 
	int sig;

	u32 pinfo;

	u32 puc;

#ifdef CONFIG_IA32_EMULATION

	compat_siginfo_t info;

#else /* !CONFIG_IA32_EMULATION */

	struct siginfo info;

#endif /* CONFIG_IA32_EMULATION */

	struct ucontext_ia32 uc;

	char retcode[8];

	/* fp state follows here */

};

#else /* !CONFIG_X86_32 */

#endif /* defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION) */



#ifdef CONFIG_X86_64

struct rt_sigframe {

	char __user *pretcode;

	struct ucontext uc;

	struct siginfo info;

	/* fp state follows here */

};

#endif /* CONFIG_X86_32 */
 
#endif /* CONFIG_X86_64 */