kernel: vm: Prepare for user mmap() interface

Signed-off-by: Ian Moffett <ian@osmora.org>

2 files changed, 19 insertions, 17 deletions

diff --git a/sys/include/sys/mman.h b/sys/include/sys/mman.h
index 4ead9ba..08f506d 100644
--- a/sys/include/sys/mman.h
+++ b/sys/include/sys/mman.h
@@ -35,6 +35,8 @@
 #if defined(_KERNEL)
 #include <sys/tree.h>
 #include <vm/vm_obj.h>
+#else
+#include <stddef.h>
 #endif  /* _KERNEL */
 
 /*
@@ -80,19 +82,19 @@ struct mmap_lgdr {
     size_t nbytes;
 };
 
-/* Kernel munmap() routine */
-int munmap_at(void *addr, size_t len);
-
-/* Kernel mmap() routine */
-void *mmap_at(void *addr, size_t len, int prot, int flags,
-              int fildes, off_t off);
-
 int mmap_entrycmp(const struct mmap_entry *a, const struct mmap_entry *b);
 RBT_PROTOTYPE(lgdr_entries, mmap_entry, hd, mmap_entrycmp)
-#endif  /* _KERNEL */
 
 /* Syscall layer */
-scret_t mmap(struct syscall_args *scargs);
-scret_t munmap(struct syscall_args *scargs);
+scret_t sys_mmap(struct syscall_args *scargs);
+scret_t sys_munmap(struct syscall_args *scargs);
+#endif  /* _KERNEL */
+
+/* Kernel munmap() routine */
+int munmap(void *addr, size_t len);
+
+/* Kernel mmap() routine */
+void *mmap(void *addr, size_t len, int prot, int flags,
+              int fildes, off_t off);
 
 #endif  /* !_SYS_MMAN_H_ */
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index b8f4aee..112f4b0 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -159,7 +159,7 @@ vm_map_modify(struct vas vas, vaddr_t va, paddr_t pa, vm_prot_t prot, bool unmap
  *      crashes.
  */
 void *
-mmap_at(void *addr, size_t len, int prot, int flags, int fildes, off_t off)
+mmap(void *addr, size_t len, int prot, int flags, int fildes, off_t off)
 {
     struct vm_object *map_obj = NULL;
     struct cdevsw *cdevp;
@@ -292,7 +292,7 @@ done:
  *      multiple of the machine page size.
  */
 int
-munmap_at(void *addr, size_t len)
+munmap(void *addr, size_t len)
 {
     int pgno;
     vaddr_t va;
@@ -348,7 +348,7 @@ munmap_at(void *addr, size_t len)
  * arg5 -> off
  */
 scret_t
-mmap(struct syscall_args *scargs)
+sys_mmap(struct syscall_args *scargs)
 {
     void *addr;
     size_t len;
@@ -357,11 +357,11 @@ mmap(struct syscall_args *scargs)
 
     addr = (void *)scargs->arg0;
     len = scargs->arg1;
-    prot = scargs->arg2;
+    prot = scargs->arg2 | PROT_USER;
     flags = scargs->arg3;
     fildes = scargs->arg4;
     off = scargs->arg5;
-    return (scret_t)mmap_at(addr, len, prot, flags, fildes, off);
+    return (scret_t)mmap(addr, len, prot, flags, fildes, off);
 }
 
 /*
@@ -371,14 +371,14 @@ mmap(struct syscall_args *scargs)
  * arg1 -> len
  */
 scret_t
-munmap(struct syscall_args *scargs)
+sys_munmap(struct syscall_args *scargs)
 {
     void *addr;
     size_t len;
 
     addr = (void *)scargs->arg0;
     len = scargs->arg1;
-    return (scret_t)munmap_at(addr, len);
+    return (scret_t)munmap(addr, len);
 }
 
 /*