CVS commit: src/sys/uvm

[Masao Uebayashi]

Module Name:    src
Committed By:   uebayasi
Date:           Sun Jan 31 07:46:03 UTC 2010

Modified Files:
        src/sys/uvm: uvm_fault.c

Log Message:
uvm_fault_internal: In lower fault handling case, put another goto to clarify
that we don't care lower neighboring pages for the zero-fill object.


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/uvm/uvm_fault.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/uvm/uvm_fault.c
diff -u src/sys/uvm/uvm_fault.c:1.134 src/sys/uvm/uvm_fault.c:1.135
--- src/sys/uvm/uvm_fault.c:1.134	Sun Jan 31 07:37:24 2010
+++ src/sys/uvm/uvm_fault.c	Sun Jan 31 07:46:03 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_fault.c,v 1.134 2010/01/31 07:37:24 uebayasi Exp $	*/
+/*	$NetBSD: uvm_fault.c,v 1.135 2010/01/31 07:46:03 uebayasi Exp $	*/
 
 /*
  *
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.134 2010/01/31 07:37:24 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.135 2010/01/31 07:46:03 uebayasi Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -1045,7 +1045,12 @@
 	 * (PGO_LOCKED).
 	 */
 
-	if (uobj) {
+	if (uobj == NULL) {
+		/* zero fill; don't care neighbor pages */
+		uobjpage = NULL;
+		goto lower_fault_lookup_done;
+	}
+
 		mutex_enter(&uobj->vmobjlock);
 		/* locked (!shadowed): maps(read), amap (if there), uobj */
 		/*
@@ -1147,10 +1152,7 @@
 			pmap_update(ufi.orig_map->pmap);
 
 lower_fault_lookup_done:
-		{}
-	} else {
-		uobjpage = NULL;
-	}
+	{}
 
 	/* locked: maps(read), amap(if there), uobj(if !null), uobjpage(if !null) */
 	KASSERT(!shadowed);