Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drop the minix_ prefixes for mmap and munmap

Browse Source 
also cleanup of various minix-specific changes, cleanup of
mmap-related testing.

Change-Id: I289a4fc50cf8a13df4a6082038d860853a4bd024
This commit is contained in:
Ben Gras
2013-11-22 16:38:29 +01:00
committed by Lionel Sambuc
parent b0cab62bd2
commit dda632a24f
34 changed files with 197 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
servers/ipc/shm.c
View File

@@ -72,7 +72,7 @@ int do_shmget(message *m)
return ENOSPC;
shm = &shm_list[shm_list_nr];
memset(shm, 0, sizeof(struct shm_struct));
shm->page = (vir_bytes) minix_mmap(0, size,
shm->page = (vir_bytes) mmap(0, size,
PROT_READ|PROT_WRITE, MAP_ANON, -1, 0);
if (shm->page == (vir_bytes) MAP_FAILED)
return ENOMEM;
@@ -171,7 +171,7 @@ void update_refcount_and_destroy(void)
int size = shm_list[i].shmid_ds.shm_segsz;
if (size % PAGE_SIZE)
size += PAGE_SIZE - size % PAGE_SIZE;
minix_munmap((void *)shm_list[i].page, size);
munmap((void *)shm_list[i].page, size);
}
}
shm_list_nr = j;

10
servers/rs/memory.c
View File

@@ -6,19 +6,19 @@
#include "inc.h"
#define minix_munmap _minix_munmap
#define munmap _munmap
#include <sys/mman.h>
#undef minix_munmap
#undef munmap
int unmap_ok = 0;
/*===========================================================================*
* minix_munmap *
* munmap *
*===========================================================================*/
int minix_munmap(void *addrstart, vir_bytes len)
int munmap(void *addrstart, vir_bytes len)
{
if(!unmap_ok)
return ENOSYS;
return _minix_munmap(addrstart, len);
return _munmap(addrstart, len);
}

2
servers/vm/mmap.c
View File

@@ -41,7 +41,7 @@ static struct vir_region *mmap_region(struct vmproc *vmp, vir_bytes addr,
if(vmm_flags & MAP_LOWER16M) vrflags |= VR_LOWER16MB;
if(vmm_flags & MAP_LOWER1M) vrflags |= VR_LOWER1MB;
if(vmm_flags & MAP_ALIGN64K) vrflags |= VR_PHYS64K;
if(vmm_flags & MAP_ALIGNMENT_64KB) vrflags |= VR_PHYS64K;
if(vmm_flags & MAP_PREALLOC) mfflags |= MF_PREALLOC;
if(vmm_flags & MAP_UNINITIALIZED) {
if(!execpriv) return NULL;

4
servers/vm/utility.c
View File

@@ -272,7 +272,7 @@ int swap_proc_dyn_data(struct vmproc *src_vmp, struct vmproc *dst_vmp)
return OK;
}
void *minix_mmap(void *addr, size_t len, int f, int f2, int f3, off_t o)
void *mmap(void *addr, size_t len, int f, int f2, int f3, off_t o)
{
void *ret;
phys_bytes p;
@@ -287,7 +287,7 @@ void *minix_mmap(void *addr, size_t len, int f, int f2, int f3, off_t o)
return ret;
}
int minix_munmap(void * addr, size_t len)
int munmap(void * addr, size_t len)
{
vm_freepages((vir_bytes) addr, roundup(len, VM_PAGE_SIZE)/VM_PAGE_SIZE);
return 0;