| vm_fault.c (24678) | vm_fault.c (25930) |
|---|---|
| 1/* 2 * Copyright (c) 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * Copyright (c) 1994 John S. Dyson 5 * All rights reserved. 6 * Copyright (c) 1994 David Greenman 7 * All rights reserved. 8 * --- 52 unchanged lines hidden (view full) --- 61 * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU 62 * School of Computer Science 63 * Carnegie Mellon University 64 * Pittsburgh PA 15213-3890 65 * 66 * any improvements or extensions that they make and grant Carnegie the 67 * rights to redistribute these changes. 68 * | 1/* 2 * Copyright (c) 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * Copyright (c) 1994 John S. Dyson 5 * All rights reserved. 6 * Copyright (c) 1994 David Greenman 7 * All rights reserved. 8 * --- 52 unchanged lines hidden (view full) --- 61 * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU 62 * School of Computer Science 63 * Carnegie Mellon University 64 * Pittsburgh PA 15213-3890 65 * 66 * any improvements or extensions that they make and grant Carnegie the 67 * rights to redistribute these changes. 68 * |
| 69 * $Id: vm_fault.c,v 1.67 1997/04/06 02:29:41 dyson Exp $ | 69 * $Id: vm_fault.c,v 1.68 1997/04/06 16:16:11 peter Exp $ |
| 70 */ 71 72/* 73 * Page fault handling module. 74 */ 75 76#include <sys/param.h> 77#include <sys/systm.h> --- 243 unchanged lines hidden (view full) --- 321 vm_page_activate(m); 322 UNLOCK_AND_DEALLOCATE; 323 VM_WAIT; 324 goto RetryFault; 325 } 326 327 m->flags |= PG_BUSY; 328 | 70 */ 71 72/* 73 * Page fault handling module. 74 */ 75 76#include <sys/param.h> 77#include <sys/systm.h> --- 243 unchanged lines hidden (view full) --- 321 vm_page_activate(m); 322 UNLOCK_AND_DEALLOCATE; 323 VM_WAIT; 324 goto RetryFault; 325 } 326 327 m->flags |= PG_BUSY; 328 |
| 329 if (m->valid && | 329 if (/*m->valid && */ |
| 330 ((m->valid & VM_PAGE_BITS_ALL) != VM_PAGE_BITS_ALL) && 331 m->object != kernel_object && m->object != kmem_object) { 332 goto readrest; 333 } 334 break; 335 } 336 if (((object->type != OBJT_DEFAULT) && (((fault_flags & VM_FAULT_WIRE_MASK) == 0) || wired)) 337 || (object == first_object)) { --- 878 unchanged lines hidden --- | 330 ((m->valid & VM_PAGE_BITS_ALL) != VM_PAGE_BITS_ALL) && 331 m->object != kernel_object && m->object != kmem_object) { 332 goto readrest; 333 } 334 break; 335 } 336 if (((object->type != OBJT_DEFAULT) && (((fault_flags & VM_FAULT_WIRE_MASK) == 0) || wired)) 337 || (object == first_object)) { --- 878 unchanged lines hidden --- |