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

m68k: switch to generic sigaltstack 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-12-23 03:06:03 -05:00
parent 0aa0203fb4
commit 08d4f65352
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/m68k/Kconfig
View File

@ -18,6 +18,7 @@ config M68K
select HAVE_MOD_ARCH_SPECIFIC select HAVE_MOD_ARCH_SPECIFIC
select MODULES_USE_ELF_REL select MODULES_USE_ELF_REL
select MODULES_USE_ELF_RELA select MODULES_USE_ELF_RELA
select GENERIC_SIGALTSTACK
config RWSEM_GENERIC_SPINLOCK config RWSEM_GENERIC_SPINLOCK
bool bool

16
arch/m68k/kernel/signal.c
View File

@ -267,13 +267,6 @@ sys_sigaction(int sig, const struct old_sigaction __user *act,
return ret; return ret;
} }
asmlinkage int
sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss)
{
return do_sigaltstack(uss, uoss, rdusp());
}
/* /*
* Do a signal return; undo the signal stack. * Do a signal return; undo the signal stack.
* *
@ -765,8 +758,9 @@ rt_restore_ucontext(struct pt_regs *regs, struct switch_stack *sw,
err |= __get_user(temp, &uc->uc_formatvec); err |= __get_user(temp, &uc->uc_formatvec);
err |= rt_restore_fpu_state(uc); err |= rt_restore_fpu_state(uc);
err |= restore_altstack(&uc->uc_stack);
if (err || do_sigaltstack(&uc->uc_stack, NULL, usp) == -EFAULT) if (err)
goto badframe; goto badframe;
if (mangle_kernel_stack(regs, temp, &uc->uc_extra)) if (mangle_kernel_stack(regs, temp, &uc->uc_extra))
@ -1014,11 +1008,7 @@ static int setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
/* Create the ucontext. */ /* Create the ucontext. */
err |= __put_user(0, &frame->uc.uc_flags); err |= __put_user(0, &frame->uc.uc_flags);
err |= __put_user(NULL, &frame->uc.uc_link); err |= __put_user(NULL, &frame->uc.uc_link);
err |= __put_user((void __user *)current->sas_ss_sp, err |= __save_altstack(&frame->uc.uc_stack, rdusp());
&frame->uc.uc_stack.ss_sp);
err |= __put_user(sas_ss_flags(rdusp()),
&frame->uc.uc_stack.ss_flags);
err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
err |= rt_setup_ucontext(&frame->uc, regs); err |= rt_setup_ucontext(&frame->uc, regs);
err |= copy_to_user (&frame->uc.uc_sigmask, set, sizeof(*set)); err |= copy_to_user (&frame->uc.uc_sigmask, set, sizeof(*set));