From: Arun Thomas <arun@minix3.org>
Date: Wed, 2 Nov 2011 17:43:59 +0000 (+0100)
Subject: pm: remove dead minix_munmap functions
X-Git-Tag: v3.2.0~281
X-Git-Url: http://zhaoyanbai.com/repos/Bv9ARM.ch02.html?a=commitdiff_plain;h=62841e2935ec83d68f92c8be89e18c8d95e90d1e;p=minix.git

pm: remove dead minix_munmap functions
---

diff --git a/servers/pm/main.c b/servers/pm/main.c
index 01a7f367b..aaa2d6bab 100644
--- a/servers/pm/main.c
+++ b/servers/pm/main.c
@@ -46,7 +46,9 @@ FORWARD _PROTOTYPE( void handle_vfs_reply, (void)			);
 #define click_to_round_k(n) \
 	((unsigned) ((((unsigned long) (n) << CLICK_SHIFT) + 512) / 1024))
 
+#if !defined(__ELF__)
 extern int unmap_ok;
+#endif
 
 /* SEF functions and variables. */
 FORWARD _PROTOTYPE( void sef_local_startup, (void) );
@@ -307,8 +309,8 @@ PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info)
   * it on startup. It's best that it's there as crtso.o knows exactly
   * what the ranges are of the filler data.
   */
-  unmap_ok = 1;
 #if !defined(__ELF__)
+  unmap_ok = 1;
   _minix_unmapzero();
 #endif
 
diff --git a/servers/pm/utility.c b/servers/pm/utility.c
index cd1b8ed0c..5b78ca2e2 100644
--- a/servers/pm/utility.c
+++ b/servers/pm/utility.c
@@ -30,12 +30,6 @@
 #include "kernel/type.h"
 #include "kernel/proc.h"
 
-#define minix_munmap _minix_munmap
-#define minix_munmap_text _minix_munmap_text
-#include <sys/mman.h>
-#undef minix_munmap
-#undef minix_munmap_text
-
 /*===========================================================================*
  *				get_free_pid				     *
  *===========================================================================*/
@@ -154,21 +148,6 @@ message *m_ptr;
   rmp->mp_flags |= VFS_CALL;
 }
 
+#if !defined(__ELF__)
 int unmap_ok = 0;
-
-PUBLIC int minix_munmap(void *addrstart, vir_bytes len)
-{
-	if(!unmap_ok) 
-		return ENOSYS;
-
-	return _minix_munmap(addrstart, len);
-}
-
-PUBLIC int minix_munmap_text(void *addrstart, vir_bytes len)
-{
-	if(!unmap_ok)
-		return ENOSYS;
-
-	return _minix_munmap_text(addrstart, len);
-
-}
+#endif