d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFi386 1.222: Remove vm_map_growstack() and acquisition and release of Giant

Browse Source 
around vm_fault() in trap_pfault().
This commit is contained in:
alc 2002-04-27 17:00:28 +00:00
parent f9bbacbcce
commit 13bef9693d
2 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/powerpc/aim/trap.c
View File

@ -479,7 +479,6 @@ trap_pfault(struct trapframe *frame, int user)
}
va = trunc_page(eva);
mtx_lock(&Giant);
if (map != kernel_map) {
/*
* Keep swapout from messing with us during this
@ -489,20 +488,8 @@ trap_pfault(struct trapframe *frame, int user)
++p->p_lock;
PROC_UNLOCK(p);
/*
* Grow the stack if necessary
*/
/* vm_map_growstack returns failure only if va falls into
* a growable stack region and the stack growth
* fails. It succeeds if va was not within
* a growable stack region, or if the stack
* growth succeeded.
*/
if (vm_map_growstack(p, va) != KERN_SUCCESS)
rv = KERN_FAILURE;
else
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
(ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY
: VM_FAULT_NORMAL);
@ -516,8 +503,6 @@ trap_pfault(struct trapframe *frame, int user)
*/
rv = vm_fault(map, va, ftype, VM_FAULT_NORMAL);
}
mtx_unlock(&Giant);
if (rv == KERN_SUCCESS)
return (0);

19
sys/powerpc/powerpc/trap.c
View File

@ -479,7 +479,6 @@ trap_pfault(struct trapframe *frame, int user)
}
va = trunc_page(eva);
mtx_lock(&Giant);
if (map != kernel_map) {
/*
* Keep swapout from messing with us during this
@ -489,20 +488,8 @@ trap_pfault(struct trapframe *frame, int user)
++p->p_lock;
PROC_UNLOCK(p);
/*
* Grow the stack if necessary
*/
/* vm_map_growstack returns failure only if va falls into
* a growable stack region and the stack growth
* fails. It succeeds if va was not within
* a growable stack region, or if the stack
* growth succeeded.
*/
if (vm_map_growstack(p, va) != KERN_SUCCESS)
rv = KERN_FAILURE;
else
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
(ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY
: VM_FAULT_NORMAL);
@ -516,8 +503,6 @@ trap_pfault(struct trapframe *frame, int user)
*/
rv = vm_fault(map, va, ftype, VM_FAULT_NORMAL);
}
mtx_unlock(&Giant);
if (rv == KERN_SUCCESS)
return (0);