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/trap.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/trap.c')
-rw-r--r-- | arch/um/os-Linux/skas/trap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/um/os-Linux/skas/trap.c b/arch/um/os-Linux/skas/trap.c index e53face44200..3b1b9244f468 100644 --- a/arch/um/os-Linux/skas/trap.c +++ b/arch/um/os-Linux/skas/trap.c | |||
@@ -58,9 +58,8 @@ void sig_handler_common_skas(int sig, void *sc_ptr) | |||
58 | 58 | ||
59 | handler = sig_info[sig]; | 59 | handler = sig_info[sig]; |
60 | 60 | ||
61 | /* unblock SIGALRM, SIGVTALRM, SIGIO if sig isn't IRQ signal */ | 61 | /* unblock SIGVTALRM, SIGIO if sig isn't IRQ signal */ |
62 | if (sig != SIGIO && sig != SIGWINCH && | 62 | if ((sig != SIGIO) && (sig != SIGWINCH) && (sig != SIGVTALRM)) |
63 | sig != SIGVTALRM && sig != SIGALRM) | ||
64 | unblock_signals(); | 63 | unblock_signals(); |
65 | 64 | ||
66 | handler(sig, r); | 65 | handler(sig, r); |