diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 15:04:19 -0400 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 09:14:55 -0400 |
| commit | d5c7e8b4ec4795ed0b8943cad8f87801fde371d7 (patch) | |
| tree | 129e234c88d0297caecdb49f285a053babaa94b3 /arch/um/os-Linux | |
| parent | 9b25fcbdc64369f4cce41e73fc0f57f3fd367d20 (diff) | |
um: don't bother blocking SIGARLM and SIGUSR1
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>
Diffstat (limited to 'arch/um/os-Linux')
| -rw-r--r-- | arch/um/os-Linux/process.c | 13 | ||||
| -rw-r--r-- | arch/um/os-Linux/signal.c | 2 | ||||
| -rw-r--r-- | arch/um/os-Linux/skas/process.c | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c index 0ced30cd4ab8..c1a8fa74ebb9 100644 --- a/arch/um/os-Linux/process.c +++ b/arch/um/os-Linux/process.c | |||
| @@ -236,20 +236,19 @@ out: | |||
| 236 | void init_new_thread_signals(void) | 236 | void init_new_thread_signals(void) |
| 237 | { | 237 | { |
| 238 | set_handler(SIGSEGV, (__sighandler_t) sig_handler, SA_ONSTACK, | 238 | set_handler(SIGSEGV, (__sighandler_t) sig_handler, SA_ONSTACK, |
| 239 | SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1); | 239 | SIGIO, SIGWINCH, SIGVTALRM, -1); |
| 240 | set_handler(SIGTRAP, (__sighandler_t) sig_handler, SA_ONSTACK, | 240 | set_handler(SIGTRAP, (__sighandler_t) sig_handler, SA_ONSTACK, |
| 241 | SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1); | 241 | SIGIO, SIGWINCH, SIGVTALRM, -1); |
| 242 | set_handler(SIGFPE, (__sighandler_t) sig_handler, SA_ONSTACK, | 242 | set_handler(SIGFPE, (__sighandler_t) sig_handler, SA_ONSTACK, |
| 243 | SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1); | 243 | SIGIO, SIGWINCH, SIGVTALRM, -1); |
| 244 | set_handler(SIGILL, (__sighandler_t) sig_handler, SA_ONSTACK, | 244 | set_handler(SIGILL, (__sighandler_t) sig_handler, SA_ONSTACK, |
| 245 | SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1); | 245 | SIGIO, SIGWINCH, SIGVTALRM, -1); |
| 246 | set_handler(SIGBUS, (__sighandler_t) sig_handler, SA_ONSTACK, | 246 | set_handler(SIGBUS, (__sighandler_t) sig_handler, SA_ONSTACK, |
| 247 | SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1); | 247 | SIGIO, SIGWINCH, SIGVTALRM, -1); |
| 248 | signal(SIGHUP, SIG_IGN); | 248 | signal(SIGHUP, SIG_IGN); |
| 249 | 249 | ||
| 250 | set_handler(SIGIO, (__sighandler_t) sig_handler, | 250 | set_handler(SIGIO, (__sighandler_t) sig_handler, |
| 251 | SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGALRM, | 251 | SA_ONSTACK | SA_RESTART, SIGIO, SIGWINCH, SIGVTALRM, -1); |
| 252 | SIGVTALRM, -1); | ||
| 253 | signal(SIGWINCH, SIG_IGN); | 252 | signal(SIGWINCH, SIG_IGN); |
| 254 | signal(SIGTERM, SIG_DFL); | 253 | signal(SIGTERM, SIG_DFL); |
| 255 | } | 254 | } |
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c index 2dde9f6d6c0f..75c3e9c9cabb 100644 --- a/arch/um/os-Linux/signal.c +++ b/arch/um/os-Linux/signal.c | |||
| @@ -112,7 +112,7 @@ void alarm_handler(int sig, struct sigcontext *sc) | |||
| 112 | void timer_init(void) | 112 | void timer_init(void) |
| 113 | { | 113 | { |
| 114 | set_handler(SIGVTALRM, (__sighandler_t) alarm_handler, | 114 | set_handler(SIGVTALRM, (__sighandler_t) alarm_handler, |
| 115 | SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, -1); | 115 | SA_ONSTACK | SA_RESTART, SIGIO, SIGWINCH, -1); |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | void set_sigstack(void *sig_stack, int size) | 118 | void set_sigstack(void *sig_stack, int size) |
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c index f481d745e231..20b34dcb0906 100644 --- a/arch/um/os-Linux/skas/process.c +++ b/arch/um/os-Linux/skas/process.c | |||
| @@ -660,7 +660,7 @@ int start_idle_thread(void *stack, jmp_buf *switch_buf) | |||
| 660 | int n; | 660 | int n; |
| 661 | 661 | ||
| 662 | set_handler(SIGWINCH, (__sighandler_t) sig_handler, | 662 | set_handler(SIGWINCH, (__sighandler_t) sig_handler, |
| 663 | SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGVTALRM, -1); | 663 | SA_ONSTACK | SA_RESTART, SIGIO, SIGVTALRM, -1); |
| 664 | 664 | ||
| 665 | /* | 665 | /* |
| 666 | * Can't use UML_SETJMP or UML_LONGJMP here because they save | 666 | * Can't use UML_SETJMP or UML_LONGJMP here because they save |
