Skip to content

Commit

Permalink
um: don't bother blocking SIGARLM and SIGUSR1
Browse files Browse the repository at this point in the history
We used to generate those, but we hadn't done that for a long
time.  No need to bother blocking them for signal handlers.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
  • Loading branch information
Al Viro authored and Richard Weinberger committed Nov 2, 2011
1 parent 9b25fcb commit d5c7e8b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
13 changes: 6 additions & 7 deletions arch/um/os-Linux/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -236,20 +236,19 @@ int __init can_drop_memory(void)
void init_new_thread_signals(void)
{
set_handler(SIGSEGV, (__sighandler_t) sig_handler, SA_ONSTACK,
SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1);
SIGIO, SIGWINCH, SIGVTALRM, -1);
set_handler(SIGTRAP, (__sighandler_t) sig_handler, SA_ONSTACK,
SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1);
SIGIO, SIGWINCH, SIGVTALRM, -1);
set_handler(SIGFPE, (__sighandler_t) sig_handler, SA_ONSTACK,
SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1);
SIGIO, SIGWINCH, SIGVTALRM, -1);
set_handler(SIGILL, (__sighandler_t) sig_handler, SA_ONSTACK,
SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1);
SIGIO, SIGWINCH, SIGVTALRM, -1);
set_handler(SIGBUS, (__sighandler_t) sig_handler, SA_ONSTACK,
SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1);
SIGIO, SIGWINCH, SIGVTALRM, -1);
signal(SIGHUP, SIG_IGN);

set_handler(SIGIO, (__sighandler_t) sig_handler,
SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGALRM,
SIGVTALRM, -1);
SA_ONSTACK | SA_RESTART, SIGIO, SIGWINCH, SIGVTALRM, -1);
signal(SIGWINCH, SIG_IGN);
signal(SIGTERM, SIG_DFL);
}
Expand Down
2 changes: 1 addition & 1 deletion arch/um/os-Linux/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ void alarm_handler(int sig, struct sigcontext *sc)
void timer_init(void)
{
set_handler(SIGVTALRM, (__sighandler_t) alarm_handler,
SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, -1);
SA_ONSTACK | SA_RESTART, SIGIO, SIGWINCH, -1);
}

void set_sigstack(void *sig_stack, int size)
Expand Down
2 changes: 1 addition & 1 deletion arch/um/os-Linux/skas/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ int start_idle_thread(void *stack, jmp_buf *switch_buf)
int n;

set_handler(SIGWINCH, (__sighandler_t) sig_handler,
SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGVTALRM, -1);
SA_ONSTACK | SA_RESTART, SIGIO, SIGVTALRM, -1);

/*
* Can't use UML_SETJMP or UML_LONGJMP here because they save
Expand Down

0 comments on commit d5c7e8b

Please sign in to comment.