Pull ec into release branch

[sfrench/cifs-2.6.git] / arch / um / sys-i386 / stub_segv.c

diff --git a/arch/um/sys-i386/stub_segv.c b/arch/um/sys-i386/stub_segv.c
index 1e88b275edacea8dede15209a158c2b4ad279cc4..2355dc19c46c544db5627b4e6f678903a23a5a0c 100644 (file)
--- a/arch/um/sys-i386/stub_segv.c
+++ b/arch/um/sys-i386/stub_segv.c
@@ -3,9 +3,11 @@
  * Licensed under the GPL
  */
 
-#include <asm/signal.h>
+#include <signal.h>
+#include <sys/select.h> /* The only way I can see to get sigset_t */
 #include <asm/unistd.h>
 #include "uml-config.h"
+#include "sysdep/stub.h"
 #include "sysdep/sigcontext.h"
 #include "sysdep/faultinfo.h"
 
@@ -13,17 +15,18 @@ void __attribute__ ((__section__ (".__syscall_stub")))
 stub_segv_handler(int sig)
 {
        struct sigcontext *sc = (struct sigcontext *) (&sig + 1);
+       int pid;
 
        GET_FAULTINFO_FROM_SC(*((struct faultinfo *) UML_CONFIG_STUB_DATA),
                              sc);
 
-       __asm__("movl %0, %%eax ; int $0x80": : "g" (__NR_getpid));
-       __asm__("movl %%eax, %%ebx ; movl %0, %%eax ; movl %1, %%ecx ;"
-               "int $0x80": : "g" (__NR_kill), "g" (SIGUSR1));
+       pid = stub_syscall0(__NR_getpid);
+       stub_syscall2(__NR_kill, pid, SIGUSR1);
+
        /* Load pointer to sigcontext into esp, since we need to leave
         * the stack in its original form when we do the sigreturn here, by
         * hand.
         */
-       __asm__("mov %0,%%esp ; movl %1, %%eax ; "
-               "int $0x80" : : "a" (sc), "g" (__NR_sigreturn));
+       __asm__ __volatile__("mov %0,%%esp ; movl %1, %%eax ; "
+                            "int $0x80" : : "a" (sc), "g" (__NR_sigreturn));
 }