Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[mv-sheeva.git] / arch / um / os-Linux / trap.c

diff --git a/arch/um/os-Linux/trap.c b/arch/um/os-Linux/trap.c
index d3a34ca8a89197bfa7730c6ad11be7e214203016..2a1c9843e32e0e298868f0e971bd85cc08b45751 100644 (file)
--- a/arch/um/os-Linux/trap.c
+++ b/arch/um/os-Linux/trap.c
@@ -20,5 +20,4 @@ void os_fill_handlinfo(struct kern_handlers h)
        sig_info[SIGSEGV] = h.page_fault;
        sig_info[SIGIO] = h.sigio_handler;
        sig_info[SIGVTALRM] = h.timer_handler;
-       sig_info[SIGALRM] = h.timer_handler;
 }