- Lock the VM when initializing the vmspace for proc0.

- Don't bother releasing Giant while doing a lookup on the vm_map of
  initproc while starting up init.  We have to grab it again right after
  the lookup anyways.
This commit is contained in:
jhb 2001-05-23 22:06:47 +00:00
parent f8b92da193
commit 87198ba253

View File

@ -374,12 +374,14 @@ proc0_init(void *dummy __unused)
limit0.p_refcnt = 1;
/* Allocate a prototype map so we have something to fork. */
mtx_lock(&vm_mtx);
pmap_pinit0(vmspace_pmap(&vmspace0));
p->p_vmspace = &vmspace0;
vmspace0.vm_refcnt = 1;
vm_map_init(&vmspace0.vm_map, round_page(VM_MIN_ADDRESS),
trunc_page(VM_MAXUSER_ADDRESS));
vmspace0.vm_map.pmap = vmspace_pmap(&vmspace0);
mtx_unlock(&vm_mtx);
p->p_addr = proc0paddr; /* XXX */
/*
@ -485,7 +487,6 @@ start_init(void *dummy)
* Need just enough stack to hold the faked-up "execve()" arguments.
*/
addr = trunc_page(USRSTACK - PAGE_SIZE);
mtx_unlock(&Giant);
mtx_lock(&vm_mtx);
if (vm_map_find(&p->p_vmspace->vm_map, NULL, 0, &addr, PAGE_SIZE,
FALSE, VM_PROT_ALL, VM_PROT_ALL, 0) != 0)
@ -493,7 +494,6 @@ start_init(void *dummy)
p->p_vmspace->vm_maxsaddr = (caddr_t)addr;
p->p_vmspace->vm_ssize = 1;
mtx_unlock(&vm_mtx);
mtx_lock(&Giant);
if ((var = getenv("init_path")) != NULL) {
strncpy(init_path, var, sizeof init_path);