rename mmap() and munmap()

	. it's a good extra interface to have but doesn't
	  meet standardised functionality
	. applications (in pkgsrc) find it and expect
	  full functionality the minix mmap doesn't offter
	. on the whole probably better to hide these functions
	  (mmap and friends) until they are grown up; the base system
	  can use the new minix_* names

diff --git a/commands/mdocml/main.c b/commands/mdocml/main.c
index fb497d3bd319b9195019ce2bf5fb580a5b1770a9..ae5c8b9029910ce94dbd81541495bc3347763dfa 100644 (file)
--- a/commands/mdocml/main.c
+++ b/commands/mdocml/main.c
@@ -644,9 +644,13 @@ fdesc(struct curparse *curp)
                roff_reset(roff);
        if (ln.buf)
                free(ln.buf);
+#ifdef __minix
+       assert(!with_mmap);
+#else
        if (with_mmap)
                munmap(blk.buf, blk.sz);
        else
+#endif
                free(blk.buf);
 
        return;

diff --git a/commands/patch/inp.c b/commands/patch/inp.c
index ecbeabb877266f9a15786c4e914e5f2301f8021a..e104cb12242dfd39c251330f1077d4278de9b672 100644 (file)
--- a/commands/patch/inp.c
+++ b/commands/patch/inp.c
@@ -102,7 +102,11 @@ re_input(void)
                free(i_ptr);
                i_ptr = NULL;
                if (i_womp != NULL) {
+#ifndef __minix
                        munmap(i_womp, i_size);
+#else
+                       free(i_womp);
+#endif
                        i_womp = NULL;
                }
        } else {
@@ -139,7 +143,11 @@ reallocate_lines(size_t *lines_allocated)
        new_size = *lines_allocated * 3 / 2;
        p = realloc(i_ptr, (new_size + 2) * sizeof(char *));
        if (p == NULL) {        /* shucks, it was a near thing */
+#ifndef __minix
                munmap(i_womp, i_size);
+#else
+               free(i_womp);
+#endif
                i_womp = NULL;
                free(i_ptr);
                i_ptr = NULL;

diff --git a/drivers/memory/memory.c b/drivers/memory/memory.c
index c38a4b8370e09064d71166a03c0913d5431a04fc..4863ce2c4038dc6ec3cd0856ae915c7be3728cbe 100644 (file)
--- a/drivers/memory/memory.c
+++ b/drivers/memory/memory.c
@@ -407,7 +407,7 @@ message *m_ptr;
        if(vlen % PAGE_SIZE) {
                vlen -= vlen % PAGE_SIZE;
        }
-       munmap((void *) vaddr, vlen);
+       minix_munmap((void *) vaddr, vlen);
        m_geom[IMGRD_DEV].dv_base= cvul64(0);
        m_geom[IMGRD_DEV].dv_size= cvul64(0);
        m_vaddrs[IMGRD_DEV] = 0;
@@ -465,7 +465,7 @@ message *m_ptr;                             /* pointer to control message */
                        panic("huge old ramdisk");
                }
                size = ex64lo(dv->dv_size);
-               munmap((void *) m_vaddrs[dev], size);
+               minix_munmap((void *) m_vaddrs[dev], size);
                m_vaddrs[dev] = (vir_bytes) NULL;
        }
 
@@ -474,7 +474,7 @@ message *m_ptr;                             /* pointer to control message */
 #endif
 
        /* Try to allocate a piece of memory for the RAM disk. */
-       if((mem = mmap(NULL, ramdev_size, PROT_READ|PROT_WRITE,
+       if((mem = minix_mmap(NULL, ramdev_size, PROT_READ|PROT_WRITE,
          MAP_PREALLOC|MAP_ANON, -1, 0)) == MAP_FAILED) {
            printf("MEM: failed to get memory for ramdisk\n");
             return(ENOMEM);

diff --git a/include/sys/mman.h b/include/sys/mman.h
index 5040ff7e4d4cdfd73e4284863931abdd25d12748..7317ea606b5a438bde43632903f889e8fcccfc85 100644 (file)
--- a/include/sys/mman.h
+++ b/include/sys/mman.h
@@ -25,9 +25,9 @@
 /* mmap() error return */
 #define MAP_FAILED      ((void *)-1)
 
-_PROTOTYPE( void *mmap, (void *, size_t, int, int, int, off_t));
-_PROTOTYPE( int munmap, (void *, size_t));
-_PROTOTYPE( int munmap_text, (void *, size_t));
+_PROTOTYPE( void *minix_mmap, (void *, size_t, int, int, int, off_t));
+_PROTOTYPE( int minix_munmap, (void *, size_t));
+_PROTOTYPE( int minix_munmap_text, (void *, size_t));
 _PROTOTYPE( void *vm_remap, (endpoint_t d, endpoint_t s, void *da,
                                void *sa, size_t si));
 _PROTOTYPE( int vm_unmap, (endpoint_t endpt, void *addr));

diff --git a/lib/csu/i386-aout/crtso.S b/lib/csu/i386-aout/crtso.S
index 6f17bee978f81763eefa4b8abe2a83ac4d06befa..f46dc25937429deaa961ea994046f32416a09932 100644 (file)
--- a/lib/csu/i386-aout/crtso.S
+++ b/lib/csu/i386-aout/crtso.S
@@ -91,7 +91,7 @@ __minix_unmapzero:
        /* unmap 0-page code */
        push    $I386_PAGE_SIZE
        push    $crtso
-       call    _munmap_text            /* unmap_text(crtso, I386_PAGE_SIZE) */
+       call    _minix_munmap_text              /* unmap_text(crtso, I386_PAGE_SIZE) */
        add     $8, %esp
 
 #ifdef __ACK__
@@ -103,7 +103,7 @@ __minix_unmapzero:
        /* unmap 0-page data */
        push    $I386_PAGE_SIZE
        push    $romstart
-       call    _munmap                 /* munmap(romstart, I386_PAGE_SIZE) */
+       call    _minix_munmap                   /* munmap(romstart, I386_PAGE_SIZE) */
        add     $8, %esp
 #endif
 

diff --git a/lib/libc/ansi/malloc-debug.c b/lib/libc/ansi/malloc-debug.c
index cb572cf34edbfbb5dd4b3358bae6e970a3ebeac6..2a32bbfd45f99c2ec3237fda09086c555911d557 100644 (file)
--- a/lib/libc/ansi/malloc-debug.c
+++ b/lib/libc/ansi/malloc-debug.c
@@ -10,6 +10,9 @@
 #include <string.h>
 #include <sys/mman.h>
 
+#define mmap minix_mmap
+#define munmap minix_munmap
+
 #include "malloc-debug.h"
 
 #if 0

diff --git a/lib/libc/other/namespace.h b/lib/libc/other/namespace.h
index 628da34cdbb1486139d801cb9594883acbf88fdf..4831f2a0fac10b6ca1191bcfcb820ba2a9e1eb8e 100644 (file)
--- a/lib/libc/other/namespace.h
+++ b/lib/libc/other/namespace.h
@@ -155,6 +155,9 @@
 #define                system                          _system
 #define                tcdrain                         _tcdrain
 #define                wait                            _wait
+#define                minix_mmap                      _minix_mmap
+#define                minix_munmap                    _minix_munmap
+#define                minix_munmap_text               _minix_munmap_text
 #endif
 
 #endif /* _NAMESPACE_H_ */

diff --git a/lib/libc/posix/_mmap.c b/lib/libc/posix/_mmap.c
index 26e2164d723b23c28d1df85f982c856cdaf51a2e..8497fddc4e6784c1a598b10679a3df0cde38333a 100644 (file)
--- a/lib/libc/posix/_mmap.c
+++ b/lib/libc/posix/_mmap.c
@@ -1,8 +1,8 @@
 #define _SYSTEM 1
 #include <lib.h>
-#define mmap   _mmap
-#define munmap _munmap
-#define munmap_text    _munmap_text
+#define minix_mmap     _minix_mmap
+#define minix_munmap   _minix_munmap
+#define minix_munmap_text      _minix_munmap_text
 #define vm_remap _vm_remap
 #define vm_unmap _vm_unmap
 #define vm_getphys _vm_getphys
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <errno.h>
 
-PUBLIC void *mmap(void *addr, size_t len, int prot, int flags,
+PUBLIC void *minix_mmap(void *addr, size_t len, int prot, int flags,
        int fd, off_t offset)
 {
        message m;
@@ -34,7 +34,7 @@ PUBLIC void *mmap(void *addr, size_t len, int prot, int flags,
        return (void *) m.VMM_RETADDR;
 }
 
-PUBLIC int munmap(void *addr, size_t len)
+PUBLIC int minix_munmap(void *addr, size_t len)
 {
        message m;
 
@@ -45,7 +45,7 @@ PUBLIC int munmap(void *addr, size_t len)
 }
 
 
-PUBLIC int munmap_text(void *addr, size_t len)
+PUBLIC int minix_munmap_text(void *addr, size_t len)
 {
        message m;
 

diff --git a/lib/libc/syscall/mmap.S b/lib/libc/syscall/mmap.S
index d8afedad88172e9f8d4200589d86a1d87886e2f5..364c6eba033916c7a3ff93a7544496871a4c0417 100644 (file)
--- a/lib/libc/syscall/mmap.S
+++ b/lib/libc/syscall/mmap.S
@@ -1,6 +1,6 @@
 #include <machine/asm.h>
 
-IMPORT(_mmap)
-ENTRY(mmap)
-       jmp     _C_LABEL(_mmap)
+IMPORT(_minix_mmap)
+ENTRY(minix_mmap)
+       jmp     _C_LABEL(_minix_mmap)
 

diff --git a/lib/libc/syscall/munmap.S b/lib/libc/syscall/munmap.S
index 5ca046694ec2effffcee961464ed0ec1232ad9c5..c7708251c30c9533d0b8b2c29f5c377f7d0f784d 100644 (file)
--- a/lib/libc/syscall/munmap.S
+++ b/lib/libc/syscall/munmap.S
@@ -1,10 +1,10 @@
 #include <machine/asm.h>
 
-IMPORT(_munmap)
-ENTRY(munmap)
-       jmp     _C_LABEL(_munmap)
+IMPORT(_minix_munmap)
+ENTRY(minix_munmap)
+       jmp     _C_LABEL(_minix_munmap)
 
-IMPORT(_munmap_text)
-ENTRY(munmap_text)
-       jmp     _C_LABEL(_munmap_text)
+IMPORT(_minix_munmap_text)
+ENTRY(minix_munmap_text)
+       jmp     _C_LABEL(_minix_munmap_text)
 

diff --git a/lib/libsys/alloc_util.c b/lib/libsys/alloc_util.c
index 40e906c12d1041b48a5a613df2340d57e40e9193..03db92f1326dd1fe30c4fde130fe9f0bfe8e593f 100644 (file)
--- a/lib/libsys/alloc_util.c
+++ b/lib/libsys/alloc_util.c
@@ -33,12 +33,12 @@ void *alloc_contig(size_t len, int flags, phys_bytes *phys)
        if(flags & AC_ALIGN64K)
                mmapflags |= MAP_ALIGN64K;
 
-       /* First try to get memory with mmap. This is guaranteed
+       /* First try to get memory with minix_mmap. This is guaranteed
         * to be page-aligned, and we can tell VM it has to be
         * pre-allocated and contiguous.
         */
        errno = 0;
-       buf = (vir_bytes) mmap(0, len, PROT_READ|PROT_WRITE, mmapflags, -1, 0);
+       buf = (vir_bytes) minix_mmap(0, len, PROT_READ|PROT_WRITE, mmapflags, -1, 0);
 
        /* If that failed, maybe we're not running in paged mode.
         * If that's the case, ENXIO will be returned.
@@ -74,6 +74,6 @@ void *alloc_contig(size_t len, int flags, phys_bytes *phys)
 
 int free_contig(void *addr, size_t len)
 {
-       return munmap(addr, len);
+       return minix_munmap(addr, len);
 }
 

diff --git a/lib/nbsd_libc/cdb/cdbr.c b/lib/nbsd_libc/cdb/cdbr.c
index 07300d4e380e43190951a0cea04492fc474bf532..90f1c526dc52a944e5fc37b6eb7a0181d008791d 100644 (file)
--- a/lib/nbsd_libc/cdb/cdbr.c
+++ b/lib/nbsd_libc/cdb/cdbr.c
@@ -123,15 +123,14 @@ cdbr_open(const char *path, int flags)
 
        cdbr->mmap_size = (size_t)sb.st_size;
 #ifdef __minix
-       cdbr->mmap_base = mmap(NULL, cdbr->mmap_size, PROT_READ, MAP_ANON, -1, (off_t)0);
-       if (cdbr->mmap_base == MAP_FAILED) {
+       if(!(cdbr->mmap_base = malloc(cdbr->mmap_size))) {
                free(cdbr);
                return NULL;
        }
 
        if (read(fd, cdbr->mmap_base, cdbr->mmap_size) != cdbr->mmap_size)
        {
-               munmap(cdbr->mmap_base, cdbr->mmap_size);
+               free(cdbr->mmap_base);
                free(cdbr);
                return NULL;
        }
@@ -256,6 +255,10 @@ cdbr_find(struct cdbr *cdbr, const void *key, size_t key_len,
 void
 cdbr_close(struct cdbr *cdbr)
 {
+#ifdef __minix
+       free(cdbr->mmap_base);
+#else
        munmap(cdbr->mmap_base, cdbr->mmap_size);
+#endif
        free(cdbr);
 }

diff --git a/lib/nbsd_libc/citrus/citrus_mmap.c b/lib/nbsd_libc/citrus/citrus_mmap.c
index 324a0cc15ec7a2fc74d4e9c199d734a955985a43..cc166a6d2fe9c4e7d4073f79f6f3a1e51290b8d0 100644 (file)
--- a/lib/nbsd_libc/citrus/citrus_mmap.c
+++ b/lib/nbsd_libc/citrus/citrus_mmap.c
@@ -75,8 +75,7 @@ _citrus_map_file(struct _citrus_region * __restrict r,
        }
 
 #ifdef __minix
-       head = mmap(NULL, (size_t)st.st_size, PROT_READ, MAP_ANON, -1, (off_t)0);
-       if (head == MAP_FAILED) {
+       if(!(head = malloc(st.st_size))) {
                ret = errno;
                goto error;
        }
@@ -107,7 +106,11 @@ _citrus_unmap_file(struct _citrus_region *r)
        _DIAGASSERT(r != NULL);
 
        if (_region_head(r) != NULL) {
+#ifdef __minix
+               free(_region_head(r));
+#else
                (void)munmap(_region_head(r), _region_size(r));
+#endif
                _region_init(r, NULL, 0);
        }
 }

diff --git a/lib/nbsd_libc/db/recno/rec_close.c b/lib/nbsd_libc/db/recno/rec_close.c
index aa31044161335e24b157acbf4425e1e850d8af05..7fb5632869feb3740b44573ad836a6b30a280f2b 100644 (file)
--- a/lib/nbsd_libc/db/recno/rec_close.c
+++ b/lib/nbsd_libc/db/recno/rec_close.c
@@ -78,8 +78,12 @@ __rec_close(DB *dbp)
 
        /* Committed to closing. */
        status = RET_SUCCESS;
+#ifndef __minix
        if (F_ISSET(t, R_MEMMAPPED) && munmap(t->bt_smap, t->bt_msize))
                status = RET_ERROR;
+#else
+       assert(!F_ISSET(t, R_MEMMAPPED));
+#endif
 
        if (!F_ISSET(t, R_INMEM)) {
                if (F_ISSET(t, R_CLOSEFP)) {

diff --git a/lib/nbsd_libc/include/namespace.h b/lib/nbsd_libc/include/namespace.h
index 4a688aa5223985430a10d834410f5b27fc5bc270..a2e6ca3c6b703aa1e5ed12f87f90bb40b1eea79d 100644 (file)
--- a/lib/nbsd_libc/include/namespace.h
+++ b/lib/nbsd_libc/include/namespace.h
@@ -443,7 +443,6 @@
 #define mi_vector_hash         _mi_vector_hash
 #define mkstemp                        _mkstemp
 #define mktime_z               _mktime_z
-#define mmap                   _mmap
 #define mpool_close            _mpool_close
 #define mpool_filter           _mpool_filter
 #define mpool_get              _mpool_get
@@ -889,8 +888,6 @@
 #define mkdir _mkdir
 #define mkfifo _mkfifo
 #define mknod _mknod
-#define munmap _munmap
-#define munmap_text _munmap_text
 #define open _open
 #define pathconf _pathconf
 #define ptrace _ptrace

diff --git a/lib/nbsd_libc/nls/catclose.c b/lib/nbsd_libc/nls/catclose.c
index 3c9944084714c51259f6d504b65e449a8ad49a96..54f6e77c2d64edc59e78c9e93c745ee2cb327d01 100644 (file)
--- a/lib/nbsd_libc/nls/catclose.c
+++ b/lib/nbsd_libc/nls/catclose.c
@@ -57,7 +57,11 @@ _catclose(catd)
        }
        
        if (catd) {
+#ifdef __minix
+               free(catd->__data);
+#else
                munmap(catd->__data, (size_t)catd->__size);
+#endif
                free (catd);
        }
 

diff --git a/lib/nbsd_libc/nls/catopen.c b/lib/nbsd_libc/nls/catopen.c
index 085f8eef99ca765878cf86e84282a3d2ceac452f..48519debdf87b9310392770ca3b4bfbb741aa778 100644 (file)
--- a/lib/nbsd_libc/nls/catopen.c
+++ b/lib/nbsd_libc/nls/catopen.c
@@ -170,14 +170,13 @@ load_msgcat(path)
        }
 
 #ifdef __minix
-       data = mmap(0, (size_t)st.st_size, PROT_READ, MAP_ANON, -1, (off_t)0);
-       if (data == MAP_FAILED) {
+       if(!(data = malloc((size_t)st.st_size))) {
                return (nl_catd)-1;
        }
 
        if (read(fd, data, st.st_size) != st.st_size)
        {
-               munmap(data, (size_t)st.st_size);
+               free(data);
                return (nl_catd)-1;
        }
        close (fd);
@@ -193,12 +192,20 @@ load_msgcat(path)
 
        if (ntohl((u_int32_t)((struct _nls_cat_hdr *)data)->__magic) !=
            _NLS_MAGIC) {
+#ifdef __minix
+               free(data);
+#else
                munmap(data, (size_t)st.st_size);
+#endif
                return (nl_catd)-1;
        }
 
        if ((catd = malloc(sizeof (*catd))) == NULL) {
+#ifdef __minix
+               free(data);
+#else
                munmap(data, (size_t)st.st_size);
+#endif
                return (nl_catd)-1;
        }
 

diff --git a/lib/nbsd_libc/stdlib/malloc.c b/lib/nbsd_libc/stdlib/malloc.c
index b28bd3ba32685bcb364c9983b8559299af709678..6e100a0e36ceb6b201ec4d5466e2b108e9bb2611 100644 (file)
--- a/lib/nbsd_libc/stdlib/malloc.c
+++ b/lib/nbsd_libc/stdlib/malloc.c
@@ -12,6 +12,11 @@
  *
  */
 
+#ifdef __minix
+#define mmap minix_mmap
+#define munmap minix_munmap
+#endif
+
 /*
  * Defining MALLOC_EXTRA_SANITY will enable extra checks which are related
  * to internal conditions and consistency in malloc.c. This has a

diff --git a/lib/nbsd_libc/sys-minix/mmap.c b/lib/nbsd_libc/sys-minix/mmap.c
index 60b2a5b8fa18fd49100a330d6c81268c5ebf514e..8869adada3398a919002ffc0011e181ec02ba600 100644 (file)
--- a/lib/nbsd_libc/sys-minix/mmap.c
+++ b/lib/nbsd_libc/sys-minix/mmap.c
@@ -6,9 +6,6 @@
 /* INCLUDES HERE */
 
 #ifdef __weak_alias
-__weak_alias(mmap, _mmap)
-__weak_alias(munmap, _munmap)
-__weak_alias(munmap_text, _munmap_text)
 __weak_alias(vm_remap, _vm_remap)
 __weak_alias(vm_unmap, _vm_unmap)
 __weak_alias(vm_getphys, _vm_getphys)
@@ -21,7 +18,7 @@ __weak_alias(vm_getrefcount, _vm_getrefcount)
 #include <string.h>
 #include <errno.h>
 
-PUBLIC void *mmap(void *addr, size_t len, int prot, int flags,
+PUBLIC void *minix_mmap(void *addr, size_t len, int prot, int flags,
        int fd, off_t offset)
 {
        message m;
@@ -43,7 +40,7 @@ PUBLIC void *mmap(void *addr, size_t len, int prot, int flags,
        return (void *) m.VMM_RETADDR;
 }
 
-PUBLIC int munmap(void *addr, size_t len)
+PUBLIC int minix_munmap(void *addr, size_t len)
 {
        message m;
 
@@ -54,7 +51,7 @@ PUBLIC int munmap(void *addr, size_t len)
 }
 
 
-PUBLIC int munmap_text(void *addr, size_t len)
+PUBLIC int minix_munmap_text(void *addr, size_t len)
 {
        message m;
 

diff --git a/nbsd_include/sys/mman.h b/nbsd_include/sys/mman.h
index 8a03de7d084f9b07aa62bf20a00cdca22d56207f..f91481b2b274a0f4f79a6a5862c5ab7bed7c38e2 100644 (file)
--- a/nbsd_include/sys/mman.h
+++ b/nbsd_include/sys/mman.h
@@ -64,11 +64,13 @@ typedef     __off_t         off_t;          /* file offset */
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
+#ifndef __minix
 void * mmap(void *, size_t, int, int, int, off_t);
 int    munmap(void *, size_t);
-
-#ifdef __minix
-int            munmap_text(void *, size_t);
+#else
+void * minix_mmap(void *, size_t, int, int, int, off_t);
+int    minix_munmap(void *, size_t);
+int            minix_munmap_text(void *, size_t);
 void *         vm_remap(int d, int s, void *da, void *sa, size_t si);
 int            vm_unmap(int endpt, void *addr);
 unsigned long  vm_getphys(int endpt, void *addr);

diff --git a/servers/ipc/shm.c b/servers/ipc/shm.c
index b90bf73cb50a40ca40988d86b2523c002296af1b..eabb1766f5bbf934fcfe78d62d0f50ea0bfa76fe 100644 (file)
--- a/servers/ipc/shm.c
+++ b/servers/ipc/shm.c
@@ -72,7 +72,7 @@ PUBLIC int do_shmget(message *m)
                        return ENOSPC;
                shm = &shm_list[shm_list_nr];
                memset(shm, 0, sizeof(struct shm_struct));
-               shm->page = (vir_bytes) mmap(0, size,
+               shm->page = (vir_bytes) minix_mmap(0, size,
                                        PROT_READ|PROT_WRITE,
                                        MAP_CONTIG|MAP_PREALLOC|MAP_ANON|MAP_IPC_SHARED,
                                        -1, 0);
@@ -173,7 +173,7 @@ PUBLIC void update_refcount_and_destroy(void)
                        int size = shm_list[i].shmid_ds.shm_segsz;
                        if (size % I386_PAGE_SIZE)
                                size += I386_PAGE_SIZE - size % I386_PAGE_SIZE;
-                       munmap((void *)shm_list[i].page, size);
+                       minix_munmap((void *)shm_list[i].page, size);
                }
        }
        shm_list_nr = j;

diff --git a/servers/pm/utility.c b/servers/pm/utility.c
index 003885363977b91f1ca2f0371953d363ee8f0103..cd1b8ed0c62f8d60ae2ef9ec662e4e9f90871242 100644 (file)
--- a/servers/pm/utility.c
+++ b/servers/pm/utility.c
@@ -30,11 +30,11 @@
 #include "kernel/type.h"
 #include "kernel/proc.h"
 
-#define munmap _munmap
-#define munmap_text _munmap_text
+#define minix_munmap _minix_munmap
+#define minix_munmap_text _minix_munmap_text
 #include <sys/mman.h>
-#undef munmap
-#undef munmap_text
+#undef minix_munmap
+#undef minix_munmap_text
 
 /*===========================================================================*
  *                             get_free_pid                                 *
@@ -156,19 +156,19 @@ message *m_ptr;
 
 int unmap_ok = 0;
 
-PUBLIC int munmap(void *addrstart, vir_bytes len)
+PUBLIC int minix_munmap(void *addrstart, vir_bytes len)
 {
        if(!unmap_ok) 
                return ENOSYS;
 
-       return _munmap(addrstart, len);
+       return _minix_munmap(addrstart, len);
 }
 
-PUBLIC int munmap_text(void *addrstart, vir_bytes len)
+PUBLIC int minix_munmap_text(void *addrstart, vir_bytes len)
 {
        if(!unmap_ok)
                return ENOSYS;
 
-       return _munmap_text(addrstart, len);
+       return _minix_munmap_text(addrstart, len);
 
 }

diff --git a/servers/rs/memory.c b/servers/rs/memory.c
index 8745ece099e1a1434097e07e6d2853b838f75aab..7d13bbe07f218e0122df86c620bbbc1fb7b05396 100644 (file)
--- a/servers/rs/memory.c
+++ b/servers/rs/memory.c
@@ -6,32 +6,32 @@
 
 #include "inc.h"
 
-#define munmap _munmap
-#define munmap_text _munmap_text
+#define minix_munmap _minix_munmap
+#define minix_munmap_text _minix_munmap_text
 #include <sys/mman.h>
-#undef munmap
-#undef munmap_text
+#undef minix_munmap
+#undef minix_munmap_text
 
 PUBLIC int unmap_ok = 0;
 
 /*===========================================================================*
- *                                 munmap                                   *
+ *                                 minix_munmap                             *
  *===========================================================================*/
-PUBLIC int munmap(void *addrstart, vir_bytes len)
+PUBLIC int minix_munmap(void *addrstart, vir_bytes len)
 {
   if(!unmap_ok) 
       return ENOSYS;
 
-  return _munmap(addrstart, len);
+  return _minix_munmap(addrstart, len);
 }
 
 /*===========================================================================*
- *                              munmap_text                                 *
+ *                              minix_munmap_text                           *
  *===========================================================================*/
-PUBLIC int munmap_text(void *addrstart, vir_bytes len)
+PUBLIC int minix_munmap_text(void *addrstart, vir_bytes len)
 {
   if(!unmap_ok)
       return ENOSYS;
 
-  return _munmap_text(addrstart, len);
+  return _minix_munmap_text(addrstart, len);
 }