uml: turn build warnings into comments

[pandora-kernel.git] / arch / um / os-Linux / skas / mem.c

diff --git a/arch/um/os-Linux/skas/mem.c b/arch/um/os-Linux/skas/mem.c
index b3c11cf..5c89463 100644 (file)
--- a/arch/um/os-Linux/skas/mem.c
+++ b/arch/um/os-Linux/skas/mem.c
@@ -6,6 +6,7 @@
 #include <signal.h>
 #include <errno.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/mman.h>
 #include <sys/wait.h>
 #include <asm/page.h>
@@ -17,17 +18,17 @@
 #include "os.h"
 #include "proc_mm.h"
 #include "ptrace_user.h"
-#include "user_util.h"
 #include "kern_util.h"
 #include "task.h"
 #include "registers.h"
 #include "uml-config.h"
 #include "sysdep/ptrace.h"
 #include "sysdep/stub.h"
+#include "init.h"
 
 extern unsigned long batch_syscall_stub, __syscall_stub_start;
 
-extern void wait_stub_done(int pid, int sig, char * fname);
+extern void wait_stub_done(int pid);
 
 static inline unsigned long *check_init_stack(struct mm_id * mm_idp,
                                              unsigned long *stack)
@@ -39,6 +40,19 @@ static inline unsigned long *check_init_stack(struct mm_id * mm_idp,
        return stack;
 }
 
+static unsigned long syscall_regs[MAX_REG_NR];
+
+static int __init init_syscall_regs(void)
+{
+       get_safe_registers(syscall_regs, NULL);
+       syscall_regs[REGS_IP_INDEX] = UML_CONFIG_STUB_CODE +
+               ((unsigned long) &batch_syscall_stub -
+                (unsigned long) &__syscall_stub_start);
+       return 0;
+}
+
+__initcall(init_syscall_regs);
+
 extern int proc_mm;
 
 int single_count = 0;
@@ -47,30 +61,33 @@ int multi_op_count = 0;
 
 static inline long do_syscall_stub(struct mm_id * mm_idp, void **addr)
 {
-       unsigned long regs[MAX_REG_NR];
-       int n;
+       int n, i;
        long ret, offset;
        unsigned long * data;
        unsigned long * syscall;
-       int pid = mm_idp->u.pid;
+       int err, pid = mm_idp->u.pid;
 
        if(proc_mm)
-#warning Need to look up userspace_pid by cpu
+               /* FIXME: Need to look up userspace_pid by cpu */
                pid = userspace_pid[0];
 
        multi_count++;
 
-       get_safe_registers(regs, NULL);
-       regs[REGS_IP_INDEX] = UML_CONFIG_STUB_CODE +
-               ((unsigned long) &batch_syscall_stub -
-                (unsigned long) &__syscall_stub_start);
-
-       n = ptrace_setregs(pid, regs);
-       if(n < 0)
+       n = ptrace_setregs(pid, syscall_regs);
+       if(n < 0){
+               printk("Registers - \n");
+               for(i = 0; i < MAX_REG_NR; i++)
+                       printk("\t%d\t0x%lx\n", i, syscall_regs[i]);
                panic("do_syscall_stub : PTRACE_SETREGS failed, errno = %d\n",
-                     n);
+                     -n);
+       }
+
+       err = ptrace(PTRACE_CONT, pid, 0, 0);
+       if(err)
+               panic("Failed to continue stub, pid = %d, errno = %d\n", pid,
+                     errno);
 
-       wait_stub_done(pid, 0, "do_syscall_stub");
+       wait_stub_done(pid);
 
        /* When the stub stops, we find the following values on the
         * beginning of the stack:
@@ -172,14 +189,10 @@ long syscall_stub_data(struct mm_id * mm_idp,
        return 0;
 }
 
-int map(struct mm_id * mm_idp, unsigned long virt, unsigned long len,
-       int r, int w, int x, int phys_fd, unsigned long long offset,
-       int done, void **data)
+int map(struct mm_id * mm_idp, unsigned long virt, unsigned long len, int prot,
+       int phys_fd, unsigned long long offset, int done, void **data)
 {
-       int prot, ret;
-
-       prot = (r ? PROT_READ : 0) | (w ? PROT_WRITE : 0) |
-               (x ? PROT_EXEC : 0);
+       int ret;
 
        if(proc_mm){
                struct proc_mm_op map;
@@ -196,9 +209,11 @@ int map(struct mm_id * mm_idp, unsigned long virt, unsigned long len,
                                           .fd  = phys_fd,
                                           .offset= offset
                                         } } } );
-               ret = os_write_file(fd, &map, sizeof(map));
-               if(ret != sizeof(map))
+               CATCH_EINTR(ret = write(fd, &map, sizeof(map)));
+               if(ret != sizeof(map)){
+                       ret = -errno;
                        printk("map : /proc/mm map failed, err = %d\n", -ret);
+               }
                else ret = 0;
        }
        else {
@@ -213,8 +228,8 @@ int map(struct mm_id * mm_idp, unsigned long virt, unsigned long len,
        return ret;
 }
 
-int unmap(struct mm_id * mm_idp, void *addr, unsigned long len, int done,
-         void **data)
+int unmap(struct mm_id * mm_idp, unsigned long addr, unsigned long len,
+         int done, void **data)
 {
        int ret;
 
@@ -228,9 +243,11 @@ int unmap(struct mm_id * mm_idp, void *addr, unsigned long len, int done,
                                           { .addr      =
                                             (unsigned long) addr,
                                             .len               = len } } } );
-               ret = os_write_file(fd, &unmap, sizeof(unmap));
-               if(ret != sizeof(unmap))
+               CATCH_EINTR(ret = write(fd, &unmap, sizeof(unmap)));
+               if(ret != sizeof(unmap)){
+                       ret = -errno;
                        printk("unmap - proc_mm write returned %d\n", ret);
+               }
                else ret = 0;
        }
        else {
@@ -245,13 +262,11 @@ int unmap(struct mm_id * mm_idp, void *addr, unsigned long len, int done,
 }
 
 int protect(struct mm_id * mm_idp, unsigned long addr, unsigned long len,
-           int r, int w, int x, int done, void **data)
+           unsigned int prot, int done, void **data)
 {
        struct proc_mm_op protect;
-       int prot, ret;
+       int ret;
 
-       prot = (r ? PROT_READ : 0) | (w ? PROT_WRITE : 0) |
-               (x ? PROT_EXEC : 0);
        if(proc_mm){
                int fd = mm_idp->u.mm_fd;
 
@@ -263,9 +278,11 @@ int protect(struct mm_id * mm_idp, unsigned long addr, unsigned long len,
                                               .len     = len,
                                               .prot    = prot } } } );
 
-               ret = os_write_file(fd, &protect, sizeof(protect));
-               if(ret != sizeof(protect))
+               CATCH_EINTR(ret = write(fd, &protect, sizeof(protect)));
+               if(ret != sizeof(protect)){
+                       ret = -errno;
                        printk("protect failed, err = %d", -ret);
+               }
                else ret = 0;
        }
        else {