Module Name: src
Committed By: uebayasi
Date: Wed Jul 14 06:33:32 UTC 2010
Modified Files:
src/sys/uvm [uebayasi-xip]: uvm_fault.c
Log Message:
One more XIP code reduction.
To generate a diff of this commit:
cvs rdiff -u -r1.166.2.16 -r1.166.2.17 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.166.2.16 src/sys/uvm/uvm_fault.c:1.166.2.17
--- src/sys/uvm/uvm_fault.c:1.166.2.16 Tue Jul 13 01:47:23 2010
+++ src/sys/uvm/uvm_fault.c Wed Jul 14 06:33:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_fault.c,v 1.166.2.16 2010/07/13 01:47:23 uebayasi Exp $ */
+/* $NetBSD: uvm_fault.c,v 1.166.2.17 2010/07/14 06:33:31 uebayasi Exp $ */
/*
*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.166.2.16 2010/07/13 01:47:23 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.166.2.17 2010/07/14 06:33:31 uebayasi Exp $");
#include "opt_uvmhist.h"
#include "opt_xip.h"
@@ -2088,14 +2088,6 @@
*/
}
- if (uvm_pageisdirect_p(uobjpage)) {
- /*
- * XIP devices pages are never paged out, no need to
- * dispose.
- */
- goto uvm_fault_lower_promote_done;
- }
-
/*
* dispose of uobjpage. it can't be PG_RELEASED
* since we still hold the object lock.
@@ -2105,8 +2097,6 @@
if (uobjpage->flags & PG_WANTED)
/* still have the obj lock */
wakeup(uobjpage);
-
-uvm_fault_lower_promote_done:
uobjpage->flags &= ~(PG_BUSY|PG_WANTED);
UVM_PAGE_OWN(uobjpage, NULL);
mutex_exit(&uobj->vmobjlock);
