69c69
< * $Id: vm_fault.c,v 1.53 1996/07/02 02:07:59 dyson Exp $
---
> * $Id: vm_fault.c,v 1.54 1996/07/27 03:23:52 dyson Exp $
296c296,297
< if (((m->valid & VM_PAGE_BITS_ALL) != VM_PAGE_BITS_ALL) &&
---
> if (m->valid &&
> ((m->valid & VM_PAGE_BITS_ALL) != VM_PAGE_BITS_ALL) &&
398a400,404
> * Found the page. Leave it busy while we play
> * with it.
> */
>
> /*
403,409c409,412
< if ((m->object != object) || (m->pindex != pindex) ||
< (m->flags & PG_TABLED) == 0) {
< m = vm_page_lookup(object, pindex);
< if( !m) {
< UNLOCK_AND_DEALLOCATE;
< goto RetryFault;
< }
---
> m = vm_page_lookup(object, pindex);
> if( !m) {
> UNLOCK_AND_DEALLOCATE;
> goto RetryFault;
481,500c484,486
< if ((m->flags & PG_ZERO) == 0) {
< if (vm_page_zero_count) {
< vm_page_protect(m, VM_PROT_NONE);
< PAGE_WAKEUP(m);
< vm_page_free(m);
< m = vm_page_alloc(object, pindex, VM_ALLOC_ZERO);
< if (!m)
< panic("vm_fault: missing zero page");
< /*
< * This should not be true, but just in case...
< */
< if ((m->flags & PG_ZERO) == 0) {
< vm_page_zero_fill(m);
< cnt.v_zfod++;
< }
< } else {
< vm_page_zero_fill(m);
< cnt.v_zfod++;
< }
< }
---
> if ((m->flags & PG_ZERO) == 0)
> vm_page_zero_fill(m);
> cnt.v_zfod++;