Module Name: src
Committed By: uebayasi
Date: Tue Nov 2 14:05:28 UTC 2010
Modified Files:
src/share/man/man9 [uebayasi-xip]: uvm.9
src/sys/arch/arm/imx [uebayasi-xip]: imx31_space.c
src/sys/arch/powerpc/powerpc [uebayasi-xip]: bus_space.c
src/sys/common/pmap [uebayasi-xip]: pmap_common.c
src/sys/uvm [uebayasi-xip]: uvm_extern.h uvm_page.c
Log Message:
Drop the 'paddr_t avail_start' and 'paddr_t avail_end' arguments
from uvm_page_physload_device(9).
Those two arguments are used by uvm_page_physload(9) to specify a
range of physical memory available for general purpose pages (pages
which are linked to freelists). Totally irrelevant to device
segments.
To generate a diff of this commit:
cvs rdiff -u -r1.102.2.1 -r1.102.2.2 src/share/man/man9/uvm.9
cvs rdiff -u -r1.3.2.5 -r1.3.2.6 src/sys/arch/arm/imx/imx31_space.c
cvs rdiff -u -r1.20.20.2 -r1.20.20.3 src/sys/arch/powerpc/powerpc/bus_space.c
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/common/pmap/pmap_common.c
cvs rdiff -u -r1.161.2.9 -r1.161.2.10 src/sys/uvm/uvm_extern.h
cvs rdiff -u -r1.153.2.57 -r1.153.2.58 src/sys/uvm/uvm_page.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/uvm.9
diff -u src/share/man/man9/uvm.9:1.102.2.1 src/share/man/man9/uvm.9:1.102.2.2
--- src/share/man/man9/uvm.9:1.102.2.1 Thu Oct 21 17:16:28 2010
+++ src/share/man/man9/uvm.9 Tue Nov 2 14:05:27 2010
@@ -1,5 +1,6 @@
-.\" $NetBSD: uvm.9,v 1.102.2.1 2010/10/21 17:16:28 uebayasi Exp $
+.\" $NetBSD: uvm.9,v 1.102.2.2 2010/11/02 14:05:27 uebayasi Exp $
.\"
+.\" Copyright (c) 2010 The NetBSD Froundation, Inc.
.\" Copyright (c) 1998 Matthew R. Green
.\" All rights reserved.
.\"
@@ -24,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd October 21, 2010
+.Dd November 2, 2010
.Dt UVM 9
.Os
.Sh NAME
@@ -659,7 +660,7 @@
.It Ft void
.Fn uvm_page_physunload "void *physseg" ;
.It Ft void *
-.Fn uvm_page_physload_device "paddr_t start" "paddr_t end" "paddr_t avail_start" "paddr_t avail_end" "int prot" "int flags" ;
+.Fn uvm_page_physload_device "paddr_t start" "paddr_t end" "int prot" "int flags" ;
.It Ft void
.Fn uvm_page_physunload_device "void *physseg" ;
.El
@@ -707,11 +708,7 @@
.Fa start
and
.Fa end
-of the physical addresses of the segment, and the
-.Fa avail_start
-and
-.Fa avail_end
-addresses of pages not already in use.
+of the physical addresses of the segment.
The
.Fa prot
describes the potential protection (region accessibility) of the
Index: src/sys/arch/arm/imx/imx31_space.c
diff -u src/sys/arch/arm/imx/imx31_space.c:1.3.2.5 src/sys/arch/arm/imx/imx31_space.c:1.3.2.6
--- src/sys/arch/arm/imx/imx31_space.c:1.3.2.5 Wed Jul 28 04:16:12 2010
+++ src/sys/arch/arm/imx/imx31_space.c Tue Nov 2 14:05:27 2010
@@ -1,7 +1,7 @@
-/* $Id: imx31_space.c,v 1.3.2.5 2010/07/28 04:16:12 uebayasi Exp $ */
+/* $Id: imx31_space.c,v 1.3.2.6 2010/11/02 14:05:27 uebayasi Exp $ */
/* derived from: */
-/* $NetBSD: imx31_space.c,v 1.3.2.5 2010/07/28 04:16:12 uebayasi Exp $ */
+/* $NetBSD: imx31_space.c,v 1.3.2.6 2010/11/02 14:05:27 uebayasi Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -306,7 +306,7 @@
const paddr_t start = imx31_bs_mmap(t, addr, 0, prot, flags);
const paddr_t end = imx31_bs_mmap(t, addr + size, 0, prot, flags);
- return uvm_page_physload_device(start, end, start, end, prot, flags);
+ return uvm_page_physload_device(start, end, prot, flags);
}
void
Index: src/sys/arch/powerpc/powerpc/bus_space.c
diff -u src/sys/arch/powerpc/powerpc/bus_space.c:1.20.20.2 src/sys/arch/powerpc/powerpc/bus_space.c:1.20.20.3
--- src/sys/arch/powerpc/powerpc/bus_space.c:1.20.20.2 Wed Aug 11 13:20:08 2010
+++ src/sys/arch/powerpc/powerpc/bus_space.c Tue Nov 2 14:05:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.20.20.2 2010/08/11 13:20:08 uebayasi Exp $ */
+/* $NetBSD: bus_space.c,v 1.20.20.3 2010/11/02 14:05:28 uebayasi Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.20.20.2 2010/08/11 13:20:08 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.20.20.3 2010/11/02 14:05:28 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -793,7 +793,7 @@
const paddr_t start = memio_mmap(t, bpa, 0, prot, flags) >> PAGE_SHIFT;
const paddr_t end = memio_mmap(t, bpa + size, 0, prot, flags) >> PAGE_SHIFT;
- return uvm_page_physload_device(start, end, start, end, prot, flags);
+ return uvm_page_physload_device(start, end, prot, flags);
}
static void
Index: src/sys/common/pmap/pmap_common.c
diff -u src/sys/common/pmap/pmap_common.c:1.1.2.1 src/sys/common/pmap/pmap_common.c:1.1.2.2
--- src/sys/common/pmap/pmap_common.c:1.1.2.1 Sat Oct 30 08:41:14 2010
+++ src/sys/common/pmap/pmap_common.c Tue Nov 2 14:05:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_common.c,v 1.1.2.1 2010/10/30 08:41:14 uebayasi Exp $ */
+/* $NetBSD: pmap_common.c,v 1.1.2.2 2010/11/02 14:05:28 uebayasi Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_common.c,v 1.1.2.1 2010/10/30 08:41:14 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_common.c,v 1.1.2.2 2010/11/02 14:05:28 uebayasi Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -42,7 +42,7 @@
start = pmap_mmap(addr, 0);
end = pmap_mmap(addr, size);
- return uvm_page_physload_device(start, end, start, end, prot, flags);
+ return uvm_page_physload_device(start, end, prot, flags);
}
void
Index: src/sys/uvm/uvm_extern.h
diff -u src/sys/uvm/uvm_extern.h:1.161.2.9 src/sys/uvm/uvm_extern.h:1.161.2.10
--- src/sys/uvm/uvm_extern.h:1.161.2.9 Sat Oct 30 05:56:00 2010
+++ src/sys/uvm/uvm_extern.h Tue Nov 2 14:05:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_extern.h,v 1.161.2.9 2010/10/30 05:56:00 uebayasi Exp $ */
+/* $NetBSD: uvm_extern.h,v 1.161.2.10 2010/11/02 14:05:28 uebayasi Exp $ */
/*
*
@@ -723,7 +723,7 @@
paddr_t, paddr_t, int);
void uvm_page_physunload(void *);
void *uvm_page_physload_device(paddr_t, paddr_t,
- paddr_t, paddr_t, int, int);
+ int, int);
void uvm_page_physunload_device(void *);
void uvm_setpagesize(void);
Index: src/sys/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.153.2.57 src/sys/uvm/uvm_page.c:1.153.2.58
--- src/sys/uvm/uvm_page.c:1.153.2.57 Wed Oct 27 14:51:29 2010
+++ src/sys/uvm/uvm_page.c Tue Nov 2 14:05:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.c,v 1.153.2.57 2010/10/27 14:51:29 uebayasi Exp $ */
+/* $NetBSD: uvm_page.c,v 1.153.2.58 2010/11/02 14:05:28 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.57 2010/10/27 14:51:29 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.58 2010/11/02 14:05:28 uebayasi Exp $");
#include "opt_ddb.h"
#include "opt_uvmhist.h"
@@ -831,8 +831,7 @@
}
void *
-uvm_page_physload_device(paddr_t start, paddr_t end, paddr_t avail_start,
- paddr_t avail_end, int prot, int flags)
+uvm_page_physload_device(paddr_t start, paddr_t end, int prot, int flags)
{
struct vm_physseg *seg;
int i;
