UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: signal: introduce helper macro is_ia32 

Introduce new macro is_ia32 for unification of setup_rt_frame().
No effect in binary, compiler will optimize.

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-09-24 19:13:11 -07:00 committed by Ingo Molnar
parent b94fd69827
commit 455edbc423
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -491,6 +491,8 @@ static int signr_convert(int sig)
return sig;
}
#define is_ia32 1
static int
setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
sigset_t *set, struct pt_regs *regs)
@ -499,10 +501,13 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
int ret;
/* Set up the stack frame */
if (ka->sa.sa_flags & SA_SIGINFO)
ret = __setup_rt_frame(usig, ka, info, set, regs);
else
ret = __setup_frame(usig, ka, set, regs);
if (is_ia32) {
if (ka->sa.sa_flags & SA_SIGINFO)
ret = __setup_rt_frame(usig, ka, info, set, regs);
else
ret = __setup_frame(usig, ka, set, regs);
} else
ret = __setup_rt_frame(sig, ka, info, set, regs);
if (ret) {
force_sigsegv(sig, current);

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

@ -286,6 +286,12 @@ static int signr_convert(int sig)
return sig;
}
#ifdef CONFIG_IA32_EMULATION
#define is_ia32 test_thread_flag(TIF_IA32)
#else
#define is_ia32 0
#endif
static int
setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
sigset_t *set, struct pt_regs *regs)
@ -293,15 +299,14 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
int usig = signr_convert(sig);
int ret;
#ifdef CONFIG_IA32_EMULATION
if (test_thread_flag(TIF_IA32)) {
/* Set up the stack frame */
if (is_ia32) {
if (ka->sa.sa_flags & SA_SIGINFO)
ret = ia32_setup_rt_frame(usig, ka, info, set, regs);
else
ret = ia32_setup_frame(usig, ka, set, regs);
} else
#endif
ret = __setup_rt_frame(sig, ka, info, set, regs);
ret = __setup_rt_frame(sig, ka, info, set, regs);
if (ret) {
force_sigsegv(sig, current);