unmap -> munmap everywhere

8ef525c0 · Austin Clements · 003c6506 · 8ef525c0 · 8ef525c0 · 8ef525c0
--- a/bin/asharing.cc
+++ b/bin/asharing.cc
@@ -32,8 +32,8 @@ vmsharing(void* arg)
  if (mmap((void *) p, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) < 0)
    die("mmap failed");

-  if (unmap((void *) p, 4096) < 0)
-    die("unmap failed");
+  if (munmap((void *) p, 4096) < 0)
+    die("munmap failed");

  return 0;
 }

--- a/bin/mapbench.cc
+++ b/bin/mapbench.cc
@@ -46,7 +46,7 @@ thr(void *arg)
 	p[j] = '\0';
    }

-    if (unmap((void *) p, npg * 4096) < 0) {
+    if (munmap((void *) p, npg * 4096) < 0) {
      fprintf(1, "%d: unmap failed\n", tid);
      exit();
    }

--- a/bin/maptest.cc
+++ b/bin/maptest.cc
@@ -76,7 +76,7 @@ main(void)

  fprintf(1, "shm ok\n");

-  if (unmap((void *) p, 8192) < 0) {
+  if (munmap((void *) p, 8192) < 0) {
    fprintf(1, "unmap failed\n");
    exit();
  }

--- a/bin/usertests.cc
+++ b/bin/usertests.cc
@@ -1726,14 +1726,14 @@ unmappedtest(void)
                   MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
    if (p == MAP_FAILED)
      die("unmappedtest: map failed");
-    int r = unmap(p, i*4096);
+    int r = munmap(p, i*4096);
    if (r < 0)
      die("unmappedtest: unmap failed");
  }
  
  off = 0x1000;
  for (int i = 1; i <= 8; i++) {
-    int r = unmap((void*)off, i*4096);
+    int r = munmap((void*)off, i*4096);
    if (r < 0)
      die("unmappedtest: unmap failed");
    off += (i*2*4096);

--- a/kernel/sysproc.cc
+++ b/kernel/sysproc.cc
@@ -168,14 +168,6 @@ sys_munmap(userptr<void> addr, size_t len)
  return 0;
 }

-//SYSCALL
-int
-sys_unmap(userptr<void> addr, size_t len)
-{
-  // XXX Compatibility
-  return sys_munmap(addr, len);
-}
-
 //SYSCALL NORET
 void
 sys_halt(void)