Synchronize with sys/i386/i386/trap.c revision 1.89.
This commit is contained in:
parent
0ddf9be1f0
commit
90bdaac7f9
@ -35,7 +35,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
|
||||
* $Id: trap.c,v 1.13 1997/02/22 09:43:28 peter Exp $
|
||||
* $Id: trap.c,v 1.14 1997/03/22 18:54:37 kato Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -568,7 +568,8 @@ trap_pfault(frame, usermode)
|
||||
}
|
||||
|
||||
/* Fault in the user page: */
|
||||
rv = vm_fault(map, va, ftype, FALSE);
|
||||
rv = vm_fault(map, va, ftype,
|
||||
(ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY : 0);
|
||||
|
||||
--p->p_lock;
|
||||
} else {
|
||||
@ -680,14 +681,13 @@ trap_pfault(frame, usermode)
|
||||
}
|
||||
|
||||
/* Fault in the user page: */
|
||||
rv = vm_fault(map, va, ftype, FALSE);
|
||||
rv = vm_fault(map, va, ftype,
|
||||
(ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY : 0);
|
||||
|
||||
--p->p_lock;
|
||||
} else {
|
||||
/*
|
||||
* Since we know that kernel virtual address addresses
|
||||
* always have pte pages mapped, we just have to fault
|
||||
* the page.
|
||||
* Don't have to worry about process locking or stacks in the kernel.
|
||||
*/
|
||||
rv = vm_fault(map, va, ftype, FALSE);
|
||||
}
|
||||
@ -858,7 +858,7 @@ int trapwrite(addr)
|
||||
/*
|
||||
* fault the data page
|
||||
*/
|
||||
rv = vm_fault(&vm->vm_map, va, VM_PROT_READ|VM_PROT_WRITE, FALSE);
|
||||
rv = vm_fault(&vm->vm_map, va, VM_PROT_READ|VM_PROT_WRITE, VM_FAULT_DIRTY);
|
||||
|
||||
--p->p_lock;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user