Pull misc into release branch

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

diff --git a/arch/um/os-Linux/tt.c b/arch/um/os-Linux/tt.c
index 919d19f11537172cf6817e3682909497eb73bd8c..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,7 +18,6 @@
 #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"
@@ -33,6 +31,7 @@
 #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)
@@ -110,6 +109,16 @@ int wait_for_stop(int pid, int sig, int cont_type, void *relay)
        }
 }
 
+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...)
@@ -134,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);