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

x86: signal: split out frame setups 



Make setup_rt_frame() and split out frame setups from handle_signal().
This is for cosmetic unification of handle_signal().

Signed-off-by: default avatarHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8fcd8e20

arch/x86/kernel/signal_32.c

+20 −9
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size, 
}



static int

setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,

__setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,

	      struct pt_regs *regs)

{

	struct sigframe __user *frame;
@@ -416,7 +416,7 @@ setup_frame(int sig, struct k_sigaction *ka, sigset_t *set, 
	return -EFAULT;

}



static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,

static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,

			    sigset_t *set, struct pt_regs *regs)

{

	struct rt_sigframe __user *frame;
@@ -501,6 +501,21 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
/*

 * OK, we're invoking a handler:

 */

static int

setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,

	       sigset_t *set, struct pt_regs *regs)

{

	int ret;



	/* Set up the stack frame */

	if (ka->sa.sa_flags & SA_SIGINFO)

		ret = __setup_rt_frame(sig, ka, info, set, regs);

	else

		ret = __setup_frame(sig, ka, set, regs);



	return ret;

}



static int

handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,

	      sigset_t *oldset, struct pt_regs *regs)
@@ -537,11 +552,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, 
	    likely(test_and_clear_thread_flag(TIF_FORCED_TF)))

		regs->flags &= ~X86_EFLAGS_TF;



	/* Set up the stack frame */

	if (ka->sa.sa_flags & SA_SIGINFO)

	ret = setup_rt_frame(sig, ka, info, oldset, regs);

	else

		ret = setup_frame(sig, ka, oldset, regs);



	if (ret)

		return ret;

arch/x86/kernel/signal_64.c

+20 −10
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ get_stack(struct k_sigaction *ka, struct pt_regs *regs, unsigned long size) 
	return (void __user *)round_down(sp - size, 64);

}



static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,

static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,

			    sigset_t *set, struct pt_regs *regs)

{

	struct rt_sigframe __user *frame;
@@ -280,6 +280,24 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
/*

 * OK, we're invoking a handler

 */

static int

setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,

	       sigset_t *set, struct pt_regs *regs)

{

	int ret;



#ifdef CONFIG_IA32_EMULATION

	if (test_thread_flag(TIF_IA32)) {

		if (ka->sa.sa_flags & SA_SIGINFO)

			ret = ia32_setup_rt_frame(sig, ka, info, set, regs);

		else

			ret = ia32_setup_frame(sig, ka, set, regs);

	} else

#endif

	ret = __setup_rt_frame(sig, ka, info, set, regs);



	return ret;

}



static int

handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
@@ -317,14 +335,6 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, 
	    likely(test_and_clear_thread_flag(TIF_FORCED_TF)))

		regs->flags &= ~X86_EFLAGS_TF;



#ifdef CONFIG_IA32_EMULATION

	if (test_thread_flag(TIF_IA32)) {

		if (ka->sa.sa_flags & SA_SIGINFO)

			ret = ia32_setup_rt_frame(sig, ka, info, oldset, regs);

		else

			ret = ia32_setup_frame(sig, ka, oldset, regs);

	} else

#endif

	ret = setup_rt_frame(sig, ka, info, oldset, regs);



	if (ret == 0) {