Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[sfrench/cifs-2.6.git] / arch / um / os-Linux / signal.c

diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index f11b3124a0c86cd22850e178e7c234fe20f9ad7e..6b81739279d1fe059e3d23310e7b532b363be8a0 100644 (file)
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -15,7 +15,6 @@
 #include "user.h"
 #include "signal_kern.h"
 #include "sysdep/sigcontext.h"
-#include "sysdep/signal.h"
 #include "sigcontext.h"
 #include "mode.h"
 #include "os.h"
@@ -38,18 +37,10 @@
 static int signals_enabled = 1;
 static int pending = 0;
 
-void sig_handler(ARCH_SIGHDLR_PARAM)
+void sig_handler(int sig, struct sigcontext *sc)
 {
-       struct sigcontext *sc;
        int enabled;
 
-       /* Must be the first thing that this handler does - x86_64 stores
-        * the sigcontext in %rdx, and we need to save it before it has a
-        * chance to get trashed.
-        */
-
-       ARCH_GET_SIGCONTEXT(sc, sig);
-
        enabled = signals_enabled;
        if(!enabled && (sig == SIGIO)){
                pending |= SIGIO_MASK;
@@ -64,15 +55,8 @@ void sig_handler(ARCH_SIGHDLR_PARAM)
        set_signals(enabled);
 }
 
-extern int timer_irq_inited;
-
 static void real_alarm_handler(int sig, struct sigcontext *sc)
 {
-       if(!timer_irq_inited){
-               signals_enabled = 1;
-               return;
-       }
-
        if(sig == SIGALRM)
                switch_timers(0);
 
@@ -84,13 +68,10 @@ static void real_alarm_handler(int sig, struct sigcontext *sc)
 
 }
 
-void alarm_handler(ARCH_SIGHDLR_PARAM)
+void alarm_handler(int sig, struct sigcontext *sc)
 {
-       struct sigcontext *sc;
        int enabled;
 
-       ARCH_GET_SIGCONTEXT(sc, sig);
-
        enabled = signals_enabled;
        if(!signals_enabled){
                if(sig == SIGVTALRM)
@@ -106,29 +87,6 @@ void alarm_handler(ARCH_SIGHDLR_PARAM)
        set_signals(enabled);
 }
 
-extern void do_boot_timer_handler(struct sigcontext * sc);
-
-void boot_timer_handler(ARCH_SIGHDLR_PARAM)
-{
-       struct sigcontext *sc;
-       int enabled;
-
-       ARCH_GET_SIGCONTEXT(sc, sig);
-
-       enabled = signals_enabled;
-       if(!enabled){
-               if(sig == SIGVTALRM)
-                       pending |= SIGVTALRM_MASK;
-               else pending |= SIGALRM_MASK;
-               return;
-       }
-
-       block_signals();
-
-       do_boot_timer_handler(sc);
-       set_signals(enabled);
-}
-
 void set_sigstack(void *sig_stack, int size)
 {
        stack_t stack = ((stack_t) { .ss_flags  = 0,
@@ -149,6 +107,10 @@ void remove_sigstack(void)
                panic("disabling signal stack failed, errno = %d\n", errno);
 }
 
+void (*handlers[_NSIG])(int sig, struct sigcontext *sc);
+
+extern void hard_handler(int sig);
+
 void set_handler(int sig, void (*handler)(int), int flags, ...)
 {
        struct sigaction action;
@@ -156,13 +118,16 @@ void set_handler(int sig, void (*handler)(int), int flags, ...)
        sigset_t sig_mask;
        int mask;
 
-       va_start(ap, flags);
-       action.sa_handler = handler;
+       handlers[sig] = (void (*)(int, struct sigcontext *)) handler;
+       action.sa_handler = hard_handler;
+
        sigemptyset(&action.sa_mask);
-       while((mask = va_arg(ap, int)) != -1){
+
+       va_start(ap, flags);
+       while((mask = va_arg(ap, int)) != -1)
                sigaddset(&action.sa_mask, mask);
-       }
        va_end(ap);
+
        action.sa_flags = flags;
        action.sa_restorer = NULL;
        if(sigaction(sig, &action, NULL) < 0)