diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 04:27:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:08 -0400 |
commit | 61b63c556c0877ee6d3832ee641bc427ff4d94d6 (patch) | |
tree | e35a047a7b11f349d3d68ac18639bc33801ec001 /arch/um/os-Linux/skas/process.c | |
parent | 5f734614fc6218db352d26571ab4d1604620199c (diff) |
uml: eliminate SIGALRM
Now that ITIMER_REAL is no longer used, there is no need for any use of
SIGALRM whatsoever. This patch removes all mention of it.
In addition, real_alarm_handler took a signal argument which is now always
SIGVTALRM. So, that is gone.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/os-Linux/skas/process.c')
-rw-r--r-- | arch/um/os-Linux/skas/process.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c index 3e64814e888e..9936531a2620 100644 --- a/arch/um/os-Linux/skas/process.c +++ b/arch/um/os-Linux/skas/process.c | |||
@@ -222,7 +222,6 @@ static int userspace_tramp(void *stack) | |||
222 | sigemptyset(&sa.sa_mask); | 222 | sigemptyset(&sa.sa_mask); |
223 | sigaddset(&sa.sa_mask, SIGIO); | 223 | sigaddset(&sa.sa_mask, SIGIO); |
224 | sigaddset(&sa.sa_mask, SIGWINCH); | 224 | sigaddset(&sa.sa_mask, SIGWINCH); |
225 | sigaddset(&sa.sa_mask, SIGALRM); | ||
226 | sigaddset(&sa.sa_mask, SIGVTALRM); | 225 | sigaddset(&sa.sa_mask, SIGVTALRM); |
227 | sigaddset(&sa.sa_mask, SIGUSR1); | 226 | sigaddset(&sa.sa_mask, SIGUSR1); |
228 | sa.sa_flags = SA_ONSTACK; | 227 | sa.sa_flags = SA_ONSTACK; |
@@ -539,8 +538,7 @@ int start_idle_thread(void *stack, jmp_buf *switch_buf) | |||
539 | int n; | 538 | int n; |
540 | 539 | ||
541 | set_handler(SIGWINCH, (__sighandler_t) sig_handler, | 540 | set_handler(SIGWINCH, (__sighandler_t) sig_handler, |
542 | SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGALRM, | 541 | SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGVTALRM, -1); |
543 | SIGVTALRM, -1); | ||
544 | 542 | ||
545 | /* | 543 | /* |
546 | * Can't use UML_SETJMP or UML_LONGJMP here because they save | 544 | * Can't use UML_SETJMP or UML_LONGJMP here because they save |