Deleted Added
full compact
vm_fault.c (43138) vm_fault.c (43748)
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.97 1999/01/24 00:55:04 dillon Exp $
69 * $Id: vm_fault.c,v 1.98 1999/01/24 06:04:52 dillon Exp $
70 */
71
72/*
73 * Page fault handling module.
74 */
75
76#include <sys/param.h>
77#include <sys/systm.h>

--- 542 unchanged lines hidden (view full) ---

620 * We don't chase down the shadow chain
621 */
622 (fs.object == fs.first_object->backing_object) &&
623
624 /*
625 * grab the lock if we need to
626 */
627 (fs.lookup_still_valid ||
70 */
71
72/*
73 * Page fault handling module.
74 */
75
76#include <sys/param.h>
77#include <sys/systm.h>

--- 542 unchanged lines hidden (view full) ---

620 * We don't chase down the shadow chain
621 */
622 (fs.object == fs.first_object->backing_object) &&
623
624 /*
625 * grab the lock if we need to
626 */
627 (fs.lookup_still_valid ||
628 (((fs.entry->eflags & MAP_ENTRY_IS_A_MAP) == 0) &&
629 lockmgr(&fs.map->lock,
630 LK_EXCLUSIVE|LK_NOWAIT, (void *)0, curproc) == 0))) {
628 lockmgr(&fs.map->lock, LK_EXCLUSIVE|LK_NOWAIT, (void *)0, curproc) == 0)
629 ) {
631
632 fs.lookup_still_valid = 1;
633 /*
634 * get rid of the unnecessary page
635 */
636 vm_page_protect(fs.first_m, VM_PROT_NONE);
637 vm_page_free(fs.first_m);
638 fs.first_m = NULL;

--- 547 unchanged lines hidden ---
630
631 fs.lookup_still_valid = 1;
632 /*
633 * get rid of the unnecessary page
634 */
635 vm_page_protect(fs.first_m, VM_PROT_NONE);
636 vm_page_free(fs.first_m);
637 fs.first_m = NULL;

--- 547 unchanged lines hidden ---