CVS commit: src/sys/uvm

[Masao Uebayashi]

Module Name:    src
Committed By:   uebayasi
Date:           Wed Feb 24 05:26:28 UTC 2010

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

Log Message:
Minor clean up.


To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 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.170 src/sys/uvm/uvm_fault.c:1.171
--- src/sys/uvm/uvm_fault.c:1.170	Wed Feb 24 05:00:55 2010
+++ src/sys/uvm/uvm_fault.c	Wed Feb 24 05:26:28 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_fault.c,v 1.170 2010/02/24 05:00:55 uebayasi Exp $	*/
+/*	$NetBSD: uvm_fault.c,v 1.171 2010/02/24 05:26:28 uebayasi Exp $	*/
 
 /*
  *
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.170 2010/02/24 05:00:55 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.171 2010/02/24 05:26:28 uebayasi Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -736,7 +736,7 @@
 static inline void	uvm_fault_upper_done(
 			    struct uvm_faultinfo *, struct uvm_faultctx *,
 			    struct uvm_object *, struct vm_anon *,
-			    struct vm_page *, struct vm_anon *);
+			    struct vm_page *);
 
 static int		uvm_fault_lower(
 			    struct uvm_faultinfo *, struct uvm_faultctx *,
@@ -770,8 +770,8 @@
 			    struct vm_page *);
 static inline void	uvm_fault_lower_done(
 			    struct uvm_faultinfo *, struct uvm_faultctx *,
-			    struct uvm_object *,
-			    struct vm_anon *, struct vm_page *);
+			    struct uvm_object *, struct vm_anon *,
+			    struct vm_page *);
 
 int
 uvm_fault_internal(struct vm_map *orig_map, vaddr_t vaddr,
@@ -1277,7 +1277,7 @@
 		/*
 		 * if center page is resident and not PG_BUSY|PG_RELEASED
 		 * then pgo_get made it PG_BUSY for us and gave us a handle
-		 * to it.  remember this page as "uobjpage." (for later use).
+		 * to it.
 		 */
 
 		if (lcv == flt->centeridx) {
@@ -1595,7 +1595,7 @@
 		return ERESTART;
 	}
 
-	uvm_fault_upper_done(ufi, flt, uobj, anon, pg, oanon);
+	uvm_fault_upper_done(ufi, flt, uobj, anon, pg);
 
 	/*
 	 * done case 1!  finish up by unlocking everything and returning success
@@ -1611,8 +1611,7 @@
 static void
 uvm_fault_upper_done(
 	struct uvm_faultinfo *ufi, struct uvm_faultctx *flt,
-	struct uvm_object *uobj, struct vm_anon *anon,
-	struct vm_page *pg, struct vm_anon *oanon)
+	struct uvm_object *uobj, struct vm_anon *anon, struct vm_page *pg)
 {
 
 	/*
@@ -2074,6 +2073,7 @@
 
 		pg->flags &= ~(PG_BUSY|PG_FAKE|PG_WANTED);
 		UVM_PAGE_OWN(pg, NULL);
+
 		uvmfault_unlockall(ufi, amap, uobj, anon);
 		if (!uvm_reclaimable()) {
 			UVMHIST_LOG(maphist,
@@ -2122,6 +2122,7 @@
 		uvm_pageactivate(pg);
 	}
 	mutex_exit(&uvm_pageqlock);
+
 	if (pg->flags & PG_WANTED)
 		wakeup(pg);