diff options
| author | alc <alc@FreeBSD.org> | 2009-03-22 02:33:48 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2009-03-22 02:33:48 +0000 |
| commit | e68330f89494e7a01639af4932f1323f74d9ef86 (patch) | |
| tree | ef469acb53aa2d787cafdfa90a59da0163661264 | |
| parent | 793ddab6bab90e04a95f750b1f966ec862de8e24 (diff) | |
| download | FreeBSD-src-e68330f89494e7a01639af4932f1323f74d9ef86.zip FreeBSD-src-e68330f89494e7a01639af4932f1323f74d9ef86.tar.gz | |
Eliminate the recomputation of pcb_cr3 from cpu_set_upcall(). The
bcopy()ed value from the old thread is the correct value because the new
thread and the old thread will share a page table.
| -rw-r--r-- | sys/amd64/amd64/vm_machdep.c | 2 | ||||
| -rw-r--r-- | sys/i386/i386/vm_machdep.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index 1e87bdc..947890b 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -287,7 +287,6 @@ cpu_set_upcall(struct thread *td, struct thread *td0) * Set registers for trampoline to user mode. Leave space for the * return address on stack. These are the kernel mode register values. */ - pcb2->pcb_cr3 = vtophys(vmspace_pmap(td->td_proc->p_vmspace)->pm_pml4); pcb2->pcb_r12 = (register_t)fork_return; /* trampoline arg */ pcb2->pcb_rbp = 0; pcb2->pcb_rsp = (register_t)td->td_frame - sizeof(void *); /* trampoline arg */ @@ -295,6 +294,7 @@ cpu_set_upcall(struct thread *td, struct thread *td0) pcb2->pcb_rip = (register_t)fork_trampoline; /* * If we didn't copy the pcb, we'd need to do the following registers: + * pcb2->pcb_cr3: cloned above. * pcb2->pcb_dr*: cloned above. * pcb2->pcb_savefpu: cloned above. * pcb2->pcb_onfault: cloned above (always NULL here?). diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 2a6ca0f..e06a9a2 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -424,11 +424,6 @@ cpu_set_upcall(struct thread *td, struct thread *td0) * Set registers for trampoline to user mode. Leave space for the * return address on stack. These are the kernel mode register values. */ -#ifdef PAE - pcb2->pcb_cr3 = vtophys(vmspace_pmap(td->td_proc->p_vmspace)->pm_pdpt); -#else - pcb2->pcb_cr3 = vtophys(vmspace_pmap(td->td_proc->p_vmspace)->pm_pdir); -#endif pcb2->pcb_edi = 0; pcb2->pcb_esi = (int)fork_return; /* trampoline arg */ pcb2->pcb_ebp = 0; @@ -439,6 +434,7 @@ cpu_set_upcall(struct thread *td, struct thread *td0) pcb2->pcb_gs = rgs(); /* * If we didn't copy the pcb, we'd need to do the following registers: + * pcb2->pcb_cr3: cloned above. * pcb2->pcb_dr*: cloned above. * pcb2->pcb_savefpu: cloned above. * pcb2->pcb_flags: cloned above. |
