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

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

x86: signal: cosmetic unification of sys_sigaltstack() 



Impact: cleanup

Add #ifdef directive for unification.

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

arch/x86/kernel/signal_32.c

+9 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ sys_sigaction(int sig, const struct old_sigaction __user *act, 
	return ret;

}



#ifdef CONFIG_X86_32

asmlinkage int sys_sigaltstack(unsigned long bx)

{

	/*
@@ -137,6 +138,14 @@ asmlinkage int sys_sigaltstack(unsigned long bx) 


	return do_sigaltstack(uss, uoss, regs->sp);

}

#else /* !CONFIG_X86_32 */

asmlinkage long

sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,

		struct pt_regs *regs)

{

	return do_sigaltstack(uss, uoss, regs->sp);

}

#endif /* CONFIG_X86_32 */



#define COPY(x)			{		\

	err |= __get_user(regs->x, &sc->x);	\

arch/x86/kernel/signal_64.c

+15 −0
Original line number Diff line number Diff line
@@ -50,12 +50,27 @@ 
# define FIX_EFLAGS	__FIX_EFLAGS

#endif



#ifdef CONFIG_X86_32

asmlinkage int sys_sigaltstack(unsigned long bx)

{

	/*

	 * This is needed to make gcc realize it doesn't own the

	 * "struct pt_regs"

	 */

	struct pt_regs *regs = (struct pt_regs *)&bx;

	const stack_t __user *uss = (const stack_t __user *)bx;

	stack_t __user *uoss = (stack_t __user *)regs->cx;



	return do_sigaltstack(uss, uoss, regs->sp);

}

#else /* !CONFIG_X86_32 */

asmlinkage long

sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,

		struct pt_regs *regs)

{

	return do_sigaltstack(uss, uoss, regs->sp);

}

#endif /* CONFIG_X86_32 */



#define COPY(x)			{		\

	err |= __get_user(regs->x, &sc->x);	\