Module Name: src
Committed By: uebayasi
Date: Mon May 31 06:38:34 UTC 2010
Modified Files:
src/sys/uvm [uebayasi-xip]: uvm_page.c uvm_page.h
Log Message:
Revert partial "phys_addr" removal code. This change is independent of
XIP, and will be done later.
To generate a diff of this commit:
cvs rdiff -u -r1.153.2.37 -r1.153.2.38 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.59.2.20 -r1.59.2.21 src/sys/uvm/uvm_page.h
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_page.c
diff -u src/sys/uvm/uvm_page.c:1.153.2.37 src/sys/uvm/uvm_page.c:1.153.2.38
--- src/sys/uvm/uvm_page.c:1.153.2.37 Fri May 28 06:41:15 2010
+++ src/sys/uvm/uvm_page.c Mon May 31 06:38:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.c,v 1.153.2.37 2010/05/28 06:41:15 uebayasi Exp $ */
+/* $NetBSD: uvm_page.c,v 1.153.2.38 2010/05/31 06:38:34 uebayasi Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.37 2010/05/28 06:41:15 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.38 2010/05/31 06:38:34 uebayasi Exp $");
#include "opt_ddb.h"
#include "opt_uvmhist.h"
@@ -488,9 +488,7 @@
/* init and free vm_pages (we've already zeroed them) */
paddr = ctob(vm_physmem_ptrs[lcv]->start);
for (i = 0 ; i < n ; i++, paddr += PAGE_SIZE) {
-#if 1
seg->pgs[i].phys_addr = paddr;
-#endif
#ifdef __HAVE_VM_PAGE_MD
VM_MDPAGE_INIT(&seg->pgs[i].mdpage, paddr);
#endif
@@ -1238,9 +1236,7 @@
return VM_PAGE_DEVICE_TO_PHYS(pg);
}
#endif
-#if 1
return pg->phys_addr;
-#else
const struct vm_physseg *seg;
int psi;
Index: src/sys/uvm/uvm_page.h
diff -u src/sys/uvm/uvm_page.h:1.59.2.20 src/sys/uvm/uvm_page.h:1.59.2.21
--- src/sys/uvm/uvm_page.h:1.59.2.20 Thu Apr 29 03:15:11 2010
+++ src/sys/uvm/uvm_page.h Mon May 31 06:38:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.h,v 1.59.2.20 2010/04/29 03:15:11 uebayasi Exp $ */
+/* $NetBSD: uvm_page.h,v 1.59.2.21 2010/05/31 06:38:34 uebayasi Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -142,9 +142,7 @@
* to modify: [O _and_ P] */
uint16_t wire_count; /* wired down map refs [P] */
uint16_t pqflags; /* page queue flags [P] */
-#if 1
paddr_t phys_addr; /* physical address of page */
-#endif
#ifdef __HAVE_VM_PAGE_MD
