Merge branch 'master' into upstream

1 files changed, 11 insertions, 2 deletions

diff --git a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c
index b98d3ca2cd1b..ff203625a4bd 100644
--- a/arch/um/os-Linux/process.c
+++ b/arch/um/os-Linux/process.c
@@ -7,7 +7,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <signal.h>
-#include <setjmp.h>
 #include <linux/unistd.h>
 #include <sys/mman.h>
 #include <sys/wait.h>
@@ -247,7 +246,17 @@ void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int))
                 set_sigstack(sig_stack, pages * page_size());
                 flags = SA_ONSTACK;
         }
-        if(usr1_handler) set_handler(SIGUSR1, usr1_handler, flags, -1);
+        if(usr1_handler){
+                struct sigaction sa;
+
+                sa.sa_handler = usr1_handler;
+                sigemptyset(&sa.sa_mask);
+                sa.sa_flags = flags;
+                sa.sa_restorer = NULL;
+                if(sigaction(SIGUSR1, &sa, NULL) < 0)
+                        panic("init_new_thread_stack - sigaction failed - "
+                              "errno = %d\n", errno);
+        }
 }
 
 void init_new_thread_signals(void)