Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 356716
b: refs/heads/master
c: 33f9f78
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro committed Feb 3, 2013
1 parent b8ec07c commit 50b2160
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 43 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7d1d990ff161bdd2f0901a0916f35d272adf4c0b
refs/heads/master: 33f9f78eec7e332dac6bee9cf66cd2bd435b7419
1 change: 1 addition & 0 deletions trunk/arch/mn10300/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ config MN10300
select MODULES_USE_ELF_RELA
select GENERIC_SIGALTSTACK
select OLD_SIGSUSPEND3
select OLD_SIGACTION

config AM33_2
def_bool n
Expand Down
7 changes: 0 additions & 7 deletions trunk/arch/mn10300/include/asm/signal.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ typedef struct {
unsigned long sig[_NSIG_WORDS];
} sigset_t;

struct old_sigaction {
__sighandler_t sa_handler;
old_sigset_t sa_mask;
unsigned long sa_flags;
__sigrestore_t sa_restorer;
};

#define __ARCH_HAS_SA_RESTORER

#include <asm/sigcontext.h>
Expand Down
35 changes: 0 additions & 35 deletions trunk/arch/mn10300/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,41 +31,6 @@

#define DEBUG_SIG 0

/*
* set signal action syscall
*/
asmlinkage long sys_sigaction(int sig,
const struct old_sigaction __user *act,
struct old_sigaction __user *oact)
{
struct k_sigaction new_ka, old_ka;
int ret;

if (act) {
old_sigset_t mask;
if (verify_area(VERIFY_READ, act, sizeof(*act)) ||
__get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
__get_user(new_ka.sa.sa_restorer, &act->sa_restorer) ||
__get_user(new_ka.sa.sa_flags, &act->sa_flags) ||
__get_user(mask, &act->sa_mask))
return -EFAULT;
siginitset(&new_ka.sa.sa_mask, mask);
}

ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);

if (!ret && oact) {
if (verify_area(VERIFY_WRITE, oact, sizeof(*oact)) ||
__put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
__put_user(old_ka.sa.sa_restorer, &oact->sa_restorer) ||
__put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||
__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))
return -EFAULT;
}

return ret;
}

/*
* do a signal return; undo the signal stack.
*/
Expand Down

0 comments on commit 50b2160

Please sign in to comment.