vserver 2.0 rc7

[linux-2.6.git] / arch / um / kernel / skas / mem_user.c

diff --git a/arch/um/kernel/skas/mem_user.c b/arch/um/kernel/skas/mem_user.c
index cfcfa0d..1310bf1 100644 (file)
--- a/arch/um/kernel/skas/mem_user.c
+++ b/arch/um/kernel/skas/mem_user.c
@@ -5,23 +5,20 @@
 
 #include <errno.h>
 #include <sys/mman.h>
-#include <sys/ptrace.h>
 #include "mem_user.h"
 #include "mem.h"
 #include "user.h"
 #include "os.h"
 #include "proc_mm.h"
 
-void map(int fd, unsigned long virt, unsigned long phys, unsigned long len, 
-        int r, int w, int x)
+void map(int fd, unsigned long virt, unsigned long len, int r, int w,
+        int x, int phys_fd, unsigned long long offset)
 {
        struct proc_mm_op map;
-       __u64 offset;
-       int prot, n, phys_fd;
+       int prot, n;
 
        prot = (r ? PROT_READ : 0) | (w ? PROT_WRITE : 0) | 
                (x ? PROT_EXEC : 0);
-       phys_fd = phys_mapping(phys, &offset);
 
        map = ((struct proc_mm_op) { .op        = MM_MMAP,
                                     .u         = 
@@ -39,7 +36,7 @@ void map(int fd, unsigned long virt, unsigned long phys, unsigned long len,
                printk("map : /proc/mm map failed, err = %d\n", -n);
 }
 
-int unmap(int fd, void *addr, int len)
+int unmap(int fd, void *addr, unsigned long len)
 {
        struct proc_mm_op unmap;
        int n;