gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "make munmap free physical pages, and one correction for aligned mmap in syscall.c (extend_process_region is called with memory-region start-address which is aligned (map_end_aligned), instead of tail-address of current-region (region->map_end)) for aligned mmap (in syscall.c)"

Browse Source 
This reverts commit e7317cca98.
This commit is contained in:
Masamichi Takagi m-takagi@ab.jp.nec.com
2012-11-26 13:38:07 +09:00
parent 3d71edd55c
commit a1490da112
5 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/syscall.c
View File

@@ -411,7 +411,7 @@ SYSCALL_DECLARE(mmap)
region->map_end =
extend_process_region(cpu_local_var(current),
region->map_start,
map_end_aligned,
region->map_end,
s + len);
aal_mc_spinlock_unlock(&cpu_local_var(current)->vm->memory_range_lock, flags);
// kprintf("syscall.c,mmap,map_end=%lx,s+len=%lx\n", region->map_end, s+len);
@@ -457,17 +457,13 @@ SYSCALL_DECLARE(mmap)
SYSCALL_DECLARE(munmap)
{
unsigned long va, pa, len;
int r;
unsigned long address, len;
va = aal_mc_syscall_arg0(ctx);
address = aal_mc_syscall_arg0(ctx);
len = aal_mc_syscall_arg1(ctx);
if(aal_mc_pt_virt_to_phys(cpu_local_var(current)->vm->page_table, (void *)va, &pa)) {
return -EFAULT;
}
r = remove_process_region(cpu_local_var(current), va, va + len, pa);
return r;
return remove_process_region(cpu_local_var(current), address,
address + len);
}
SYSCALL_DECLARE(mprotect)