This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / um / kernel / trap_user.c

diff --git a/arch/um/kernel/trap_user.c b/arch/um/kernel/trap_user.c
index 0a3d279..d12eac6 100644 (file)
--- a/arch/um/kernel/trap_user.c
+++ b/arch/um/kernel/trap_user.c
@@ -18,6 +18,7 @@
 #include "sigcontext.h"
 #include "sysdep/sigcontext.h"
 #include "irq_user.h"
+#include "frame_user.h"
 #include "signal_user.h"
 #include "time_user.h"
 #include "task.h"
@@ -102,6 +103,28 @@ struct signal_info sig_info[] = {
                      .is_irq           = 0 },
 };
 
+void sig_handler(int sig, struct sigcontext sc)
+{
+       CHOOSE_MODE_PROC(sig_handler_common_tt, sig_handler_common_skas,
+                        sig, &sc);
+}
+
+extern int timer_irq_inited;
+
+void alarm_handler(int sig, struct sigcontext sc)
+{
+       if(!timer_irq_inited) return;
+
+       if(sig == SIGALRM)
+               switch_timers(0);
+
+       CHOOSE_MODE_PROC(sig_handler_common_tt, sig_handler_common_skas,
+                        sig, &sc);
+
+       if(sig == SIGALRM)
+               switch_timers(1);
+}
+
 void do_longjmp(void *b, int val)
 {
        sigjmp_buf *buf = b;