uml: remove page_size()

[linux-2.6.git] / arch / um / os-Linux / tt.c

diff --git a/arch/um/os-Linux/tt.c b/arch/um/os-Linux/tt.c
index a6db8877931a8cbc06a39911e35d61059c58c61f..bcf9359c4e9f4cf87f89bfbea66d62768d70beda 100644 (file)
--- a/arch/um/os-Linux/tt.c
+++ b/arch/um/os-Linux/tt.c
@@ -10,7 +10,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <setjmp.h>
 #include <sys/time.h>
 #include <sys/ptrace.h>
 #include <linux/ptrace.h>
@@ -19,22 +18,20 @@
 #include <asm/ptrace.h>
 #include <asm/unistd.h>
 #include <asm/page.h>
-#include "user_util.h"
 #include "kern_util.h"
 #include "user.h"
 #include "signal_kern.h"
-#include "signal_user.h"
 #include "sysdep/ptrace.h"
 #include "sysdep/sigcontext.h"
 #include "irq_user.h"
 #include "ptrace_user.h"
-#include "time_user.h"
 #include "init.h"
 #include "os.h"
 #include "uml-config.h"
 #include "choose-mode.h"
 #include "mode.h"
 #include "tempfile.h"
+#include "kern_constants.h"
 
 int protect_memory(unsigned long addr, unsigned long len, int r, int w, int x,
                   int must_succeed)
@@ -50,6 +47,78 @@ int protect_memory(unsigned long addr, unsigned long len, int r, int w, int x,
        return(0);
 }
 
+void kill_child_dead(int pid)
+{
+       kill(pid, SIGKILL);
+       kill(pid, SIGCONT);
+       do {
+               int n;
+               CATCH_EINTR(n = waitpid(pid, NULL, 0));
+               if (n > 0)
+                       kill(pid, SIGCONT);
+               else
+                       break;
+       } while(1);
+}
+
+void stop(void)
+{
+       while(1) sleep(1000000);
+}
+
+int wait_for_stop(int pid, int sig, int cont_type, void *relay)
+{
+       sigset_t *relay_signals = relay;
+       int status, ret;
+
+       while(1){
+               CATCH_EINTR(ret = waitpid(pid, &status, WUNTRACED));
+               if((ret < 0) ||
+                  !WIFSTOPPED(status) || (WSTOPSIG(status) != sig)){
+                       if(ret < 0){
+                               printk("wait failed, errno = %d\n",
+                                      errno);
+                       }
+                       else if(WIFEXITED(status))
+                               printk("process %d exited with status %d\n",
+                                      pid, WEXITSTATUS(status));
+                       else if(WIFSIGNALED(status))
+                               printk("process %d exited with signal %d\n",
+                                      pid, WTERMSIG(status));
+                       else if((WSTOPSIG(status) == SIGVTALRM) ||
+                               (WSTOPSIG(status) == SIGALRM) ||
+                               (WSTOPSIG(status) == SIGIO) ||
+                               (WSTOPSIG(status) == SIGPROF) ||
+                               (WSTOPSIG(status) == SIGCHLD) ||
+                               (WSTOPSIG(status) == SIGWINCH) ||
+                               (WSTOPSIG(status) == SIGINT)){
+                               ptrace(cont_type, pid, 0, WSTOPSIG(status));
+                               continue;
+                       }
+                       else if((relay_signals != NULL) &&
+                               sigismember(relay_signals, WSTOPSIG(status))){
+                               ptrace(cont_type, pid, 0, WSTOPSIG(status));
+                               continue;
+                       }
+                       else printk("process %d stopped with signal %d\n",
+                                   pid, WSTOPSIG(status));
+                       panic("wait_for_stop failed to wait for %d to stop "
+                             "with %d\n", pid, sig);
+               }
+               return(status);
+       }
+}
+
+void forward_ipi(int fd, int pid)
+{
+       int err;
+
+       err = os_set_owner(fd, pid);
+       if(err < 0)
+               printk("forward_ipi: set_owner failed, fd = %d, me = %d, "
+                      "target = %d, err = %d\n", fd, os_getpid(), pid, -err);
+}
+
 /*
  *-------------------------
  * only for tt mode (will be deleted in future...)
@@ -74,7 +143,7 @@ int outer_tramp(void *arg)
        int sig = sigkill;
 
        t = arg;
-       t->pid = clone(t->tramp, (void *) t->temp_stack + page_size()/2,
+       t->pid = clone(t->tramp, (void *) t->temp_stack + UM_KERN_PAGE_SIZE/2,
                       t->flags, t->tramp_data);
        if(t->pid > 0) wait_for_stop(t->pid, SIGSTOP, PTRACE_CONT, NULL);
        kill(os_getpid(), sig);