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

Merge branch 'master' of postpeta.pccluster.org:mckernel

Browse Source 
Conflicts:
	kernel/host.c
	kernel/process.c
	lib/include/ihk/mm.h
This commit is contained in:
Tomoki Shirasawa
2013-05-28 12:49:13 +09:00
parent bb4caccf98 f8f91488b3
commit da3965be11
9 changed files with 149 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/host.c
View File

@@ -76,7 +76,7 @@ static int process_msg_prepare_process(unsigned long rphys)
ihk_mc_unmap_memory(NULL, phys, sz);
return -ENOMEM;
}
proc->pid = 1024;
proc->pid = pn->pid;
proc->vm->region.user_start = pn->user_start;
proc->vm->region.user_end = pn->user_end;
@@ -213,7 +213,7 @@ static int process_msg_prepare_process(unsigned long rphys)
}
args_envs_p = virt_to_phys(args_envs);
if(add_process_memory_range(proc, addr, e, args_envs_p, VR_RESERVED) != 0){
if(add_process_memory_range(proc, addr, e, args_envs_p, VR_NONE) != 0){
ihk_mc_free_pages(args_envs, ARGENV_PAGE_COUNT);
goto err;
}
@@ -306,7 +306,6 @@ err:
ihk_mc_unmap_virtual(p, npages, 1);
ihk_mc_unmap_memory(NULL, phys, sz);
free_process_memory(proc);
// TODO: call page tables free by nakamura
destroy_process(proc);
return -ENOMEM;
}