Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 273004
b: refs/heads/master
c: d5c7e8b
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro authored and Richard Weinberger committed Nov 2, 2011
1 parent 9d2ec08 commit 9286d08
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 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: 9b25fcbdc64369f4cce41e73fc0f57f3fd367d20
refs/heads/master: d5c7e8b4ec4795ed0b8943cad8f87801fde371d7
13 changes: 6 additions & 7 deletions trunk/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 trunk/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 trunk/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 9286d08

Please sign in to comment.