From 9286d08aa2a9ac2b905f251a6b7f55ed2f6099e4 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 18 Aug 2011 20:04:19 +0100 Subject: [PATCH] --- yaml --- r: 273004 b: refs/heads/master c: d5c7e8b4ec4795ed0b8943cad8f87801fde371d7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/os-Linux/process.c | 13 ++++++------- trunk/arch/um/os-Linux/signal.c | 2 +- trunk/arch/um/os-Linux/skas/process.c | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 57ede900c266..a788512f6960 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b25fcbdc64369f4cce41e73fc0f57f3fd367d20 +refs/heads/master: d5c7e8b4ec4795ed0b8943cad8f87801fde371d7 diff --git a/trunk/arch/um/os-Linux/process.c b/trunk/arch/um/os-Linux/process.c index 0ced30cd4ab8..c1a8fa74ebb9 100644 --- a/trunk/arch/um/os-Linux/process.c +++ b/trunk/arch/um/os-Linux/process.c @@ -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); } diff --git a/trunk/arch/um/os-Linux/signal.c b/trunk/arch/um/os-Linux/signal.c index 2dde9f6d6c0f..75c3e9c9cabb 100644 --- a/trunk/arch/um/os-Linux/signal.c +++ b/trunk/arch/um/os-Linux/signal.c @@ -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) diff --git a/trunk/arch/um/os-Linux/skas/process.c b/trunk/arch/um/os-Linux/skas/process.c index f481d745e231..20b34dcb0906 100644 --- a/trunk/arch/um/os-Linux/skas/process.c +++ b/trunk/arch/um/os-Linux/skas/process.c @@ -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