Module Name: src
Committed By: uebayasi
Date: Mon Nov 15 15:11:54 UTC 2010
Modified Files:
src/share/man/man9 [uebayasi-xip]: pmap.9
src/sys/arch/acorn26/acorn26 [uebayasi-xip]: mem.c pmap.c
src/sys/arch/alpha/alpha [uebayasi-xip]: mem.c pmap.c
src/sys/arch/amd64/amd64 [uebayasi-xip]: mem.c
src/sys/arch/arm/arm32 [uebayasi-xip]: mem.c pmap.c
src/sys/uvm [uebayasi-xip]: files.uvm uvm_pmap.h
Removed Files:
src/sys/common/pmap [uebayasi-xip]: pmap_common.c
src/sys/dev [uebayasi-xip]: xmd.c
Log Message:
Revert xmd(4).
To generate a diff of this commit:
cvs rdiff -u -r1.42.2.2 -r1.42.2.3 src/share/man/man9/pmap.9
cvs rdiff -u -r1.14.2.1 -r1.14.2.2 src/sys/arch/acorn26/acorn26/mem.c
cvs rdiff -u -r1.30.2.5 -r1.30.2.6 src/sys/arch/acorn26/acorn26/pmap.c
cvs rdiff -u -r1.40.2.1 -r1.40.2.2 src/sys/arch/alpha/alpha/mem.c
cvs rdiff -u -r1.252.2.9 -r1.252.2.10 src/sys/arch/alpha/alpha/pmap.c
cvs rdiff -u -r1.19.2.1 -r1.19.2.2 src/sys/arch/amd64/amd64/mem.c
cvs rdiff -u -r1.26.6.7 -r1.26.6.8 src/sys/arch/arm/arm32/mem.c
cvs rdiff -u -r1.211.2.22 -r1.211.2.23 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.1.2.2 -r0 src/sys/common/pmap/pmap_common.c
cvs rdiff -u -r1.1.2.6 -r0 src/sys/dev/xmd.c
cvs rdiff -u -r1.16.2.2 -r1.16.2.3 src/sys/uvm/files.uvm
cvs rdiff -u -r1.32.2.6 -r1.32.2.7 src/sys/uvm/uvm_pmap.h
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/pmap.9
diff -u src/share/man/man9/pmap.9:1.42.2.2 src/share/man/man9/pmap.9:1.42.2.3
--- src/share/man/man9/pmap.9:1.42.2.2 Sat Oct 30 08:41:14 2010
+++ src/share/man/man9/pmap.9 Mon Nov 15 15:11:52 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: pmap.9,v 1.42.2.2 2010/10/30 08:41:14 uebayasi Exp $
+.\" $NetBSD: pmap.9,v 1.42.2.3 2010/11/15 15:11:52 uebayasi Exp $
.\"
.\" Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 30, 2010
+.Dd November 4, 2009
.Dt PMAP 9
.Os
.Sh NAME
@@ -69,12 +69,6 @@
.Fn "pmap_protect" "pmap_t pmap" "vaddr_t sva" "vaddr_t eva" "vm_prot_t prot"
.Ft void
.Fn "pmap_unwire" "pmap_t pmap" "vaddr_t va"
-.Ft void *
-.Fn "pmap_physload_device" "vaddr_t addr" "off_t off" "int prot" "int flags"
-.Ft void
-.Fn "pmap_unphysload_device" "void *phys"
-.Ft paddr_t
-.Fn "pmap_mmap" "vaddr_t addr" "off_t off"
.Ft bool
.Fn "pmap_extract" "pmap_t pmap" "vaddr_t va" "paddr_t *pap"
.Ft void
@@ -600,35 +594,6 @@
.Dq wired
attribute on the mapping for virtual address
.Fa va .
-.It void * Fn "pmap_physload_device" "vaddr_t addr" "off_t off" \
- "int prot" "int flags"
-This function registers a kernel virtual address region of system
-memory described by
-.Fa addr
-and
-.Fa off
-as a physical device memory segment like a NOR FlashROM,
-and return a cookie pointer to the registered segment.
-The registered region will be mapped into user address space.
-.It void Fn "pmap_physunload_device" "void *phys"
-Free a physical segment previously allocated by
-.Fn pmap_physload_device 9 .
-.It paddr_t Fn "pmap_mmap" "vaddr_t addr" "off_t off"
-This function converts a given kernel virtual address described by
-.Fa addr
-and
-.Fa off
-to a physical mmap cookie.
-This interface is only used by machine-dependent memory devices,
-.Xr mem 4
-and
-.Xr xmd 4 ,
-to map part of kernel memory to user address spaces.
-.Pp
-Note that the
-.Fn pmap_mmap
-cares only addresses.
-Callers are respensible to check protection.
.It bool Fn "pmap_extract" "pmap_t pmap" "vaddr_t va" "paddr_t *pap"
This function extracts a mapping from the specified physical map.
It serves two purposes: to determine if a mapping exists for the specified
Index: src/sys/arch/acorn26/acorn26/mem.c
diff -u src/sys/arch/acorn26/acorn26/mem.c:1.14.2.1 src/sys/arch/acorn26/acorn26/mem.c:1.14.2.2
--- src/sys/arch/acorn26/acorn26/mem.c:1.14.2.1 Sat Oct 30 08:41:05 2010
+++ src/sys/arch/acorn26/acorn26/mem.c Mon Nov 15 15:11:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mem.c,v 1.14.2.1 2010/10/30 08:41:05 uebayasi Exp $ */
+/* $NetBSD: mem.c,v 1.14.2.2 2010/11/15 15:11:52 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.14.2.1 2010/10/30 08:41:05 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.14.2.2 2010/11/15 15:11:52 uebayasi Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -212,9 +212,7 @@
/* XXX This may botch our cacheing assumptions. Do we care? */
ppn = atop(off);
- KASSERT(ppn >= 0);
- if (ppn >= physmem)
- return -1;
-
- return pmap_mmap(0, off);
+ if (ppn >= 0 && ppn < physmem)
+ return ppn;
+ return -1;
}
Index: src/sys/arch/acorn26/acorn26/pmap.c
diff -u src/sys/arch/acorn26/acorn26/pmap.c:1.30.2.5 src/sys/arch/acorn26/acorn26/pmap.c:1.30.2.6
--- src/sys/arch/acorn26/acorn26/pmap.c:1.30.2.5 Sat Oct 30 08:41:05 2010
+++ src/sys/arch/acorn26/acorn26/pmap.c Mon Nov 15 15:11:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.30.2.5 2010/10/30 08:41:05 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.30.2.6 2010/11/15 15:11:52 uebayasi Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 Ben Harris
* All rights reserved.
@@ -102,7 +102,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.30.2.5 2010/10/30 08:41:05 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.30.2.6 2010/11/15 15:11:52 uebayasi Exp $");
#include <sys/kernel.h> /* for cold */
#include <sys/malloc.h>
@@ -723,13 +723,6 @@
splx(s);
}
-paddr_t
-pmap_mmap(vaddr_t addr, off_t off)
-{
-
- return atop(addr + off);
-}
-
bool
pmap_extract(pmap_t pmap, vaddr_t va, paddr_t *ppa)
{
Index: src/sys/arch/alpha/alpha/mem.c
diff -u src/sys/arch/alpha/alpha/mem.c:1.40.2.1 src/sys/arch/alpha/alpha/mem.c:1.40.2.2
--- src/sys/arch/alpha/alpha/mem.c:1.40.2.1 Sat Oct 30 08:41:06 2010
+++ src/sys/arch/alpha/alpha/mem.c Mon Nov 15 15:11:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mem.c,v 1.40.2.1 2010/10/30 08:41:06 uebayasi Exp $ */
+/* $NetBSD: mem.c,v 1.40.2.2 2010/11/15 15:11:53 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -78,7 +78,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.40.2.1 2010/10/30 08:41:06 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.40.2.2 2010/11/15 15:11:53 uebayasi Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -216,6 +216,5 @@
*/
if ((prot & alpha_pa_access(off)) != prot)
return (-1);
-
- return pmap_mmap(0, off);
+ return (alpha_btop(off));
}
Index: src/sys/arch/alpha/alpha/pmap.c
diff -u src/sys/arch/alpha/alpha/pmap.c:1.252.2.9 src/sys/arch/alpha/alpha/pmap.c:1.252.2.10
--- src/sys/arch/alpha/alpha/pmap.c:1.252.2.9 Wed Nov 10 08:59:12 2010
+++ src/sys/arch/alpha/alpha/pmap.c Mon Nov 15 15:11:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.252.2.9 2010/11/10 08:59:12 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.252.2.10 2010/11/15 15:11:53 uebayasi Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008 The NetBSD Foundation, Inc.
@@ -140,7 +140,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.252.2.9 2010/11/10 08:59:12 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.252.2.10 2010/11/15 15:11:53 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2034,19 +2034,6 @@
}
/*
- * pmap_mmap [ INTERFACE ]
- *
- * Convert the given kernel virtual address to the page frame
- * number (mmap cookie).
- */
-paddr_t
-pmap_mmap(vaddr_t addr, off_t off)
-{
-
- return alpha_btop(addr + off);
-}
-
-/*
* pmap_extract: [ INTERFACE ]
*
* Extract the physical address associated with the given
Index: src/sys/arch/amd64/amd64/mem.c
diff -u src/sys/arch/amd64/amd64/mem.c:1.19.2.1 src/sys/arch/amd64/amd64/mem.c:1.19.2.2
--- src/sys/arch/amd64/amd64/mem.c:1.19.2.1 Sat Oct 30 08:41:06 2010
+++ src/sys/arch/amd64/amd64/mem.c Mon Nov 15 15:11:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mem.c,v 1.19.2.1 2010/10/30 08:41:06 uebayasi Exp $ */
+/* $NetBSD: mem.c,v 1.19.2.2 2010/11/15 15:11:53 uebayasi Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.19.2.1 2010/10/30 08:41:06 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.19.2.2 2010/11/15 15:11:53 uebayasi Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -260,5 +260,5 @@
if (check_pa_acc(off, prot) != 0)
return -1;
- return pmap_mmap(0, off);
+ return x86_btop(off);
}
Index: src/sys/arch/arm/arm32/mem.c
diff -u src/sys/arch/arm/arm32/mem.c:1.26.6.7 src/sys/arch/arm/arm32/mem.c:1.26.6.8
--- src/sys/arch/arm/arm32/mem.c:1.26.6.7 Sat Nov 6 08:08:14 2010
+++ src/sys/arch/arm/arm32/mem.c Mon Nov 15 15:11:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mem.c,v 1.26.6.7 2010/11/06 08:08:14 uebayasi Exp $ */
+/* $NetBSD: mem.c,v 1.26.6.8 2010/11/15 15:11:53 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
#include "opt_xip.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.26.6.7 2010/11/06 08:08:14 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.26.6.8 2010/11/15 15:11:53 uebayasi Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -220,6 +220,5 @@
if (off >= ctob(physmem) && kauth_authorize_machdep(l->l_cred,
KAUTH_MACHDEP_UNMANAGEDMEM, NULL, NULL, NULL, NULL) != 0)
return -1;
-
- return pmap_mmap(0, off);
+ return arm_btop(off);
}
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.211.2.22 src/sys/arch/arm/arm32/pmap.c:1.211.2.23
--- src/sys/arch/arm/arm32/pmap.c:1.211.2.22 Wed Nov 10 08:59:13 2010
+++ src/sys/arch/arm/arm32/pmap.c Mon Nov 15 15:11:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.211.2.22 2010/11/10 08:59:13 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.211.2.23 2010/11/15 15:11:53 uebayasi Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -211,7 +211,7 @@
#include <machine/param.h>
#include <arm/arm32/katelib.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.22 2010/11/10 08:59:13 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.23 2010/11/15 15:11:53 uebayasi Exp $");
#define VM_PAGE_TO_MD(pg) (&(pg)->mdpage)
@@ -3518,13 +3518,6 @@
cpu_cpwait();
}
-paddr_t
-pmap_mmap(vaddr_t addr, off_t off)
-{
-
- return arm_btop(vtophys(addr + off));
-}
-
bool
pmap_extract(pmap_t pm, vaddr_t va, paddr_t *pap)
{
Index: src/sys/uvm/files.uvm
diff -u src/sys/uvm/files.uvm:1.16.2.2 src/sys/uvm/files.uvm:1.16.2.3
--- src/sys/uvm/files.uvm:1.16.2.2 Sat Oct 30 08:41:14 2010
+++ src/sys/uvm/files.uvm Mon Nov 15 15:11:54 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.uvm,v 1.16.2.2 2010/10/30 08:41:14 uebayasi Exp $
+# $NetBSD: files.uvm,v 1.16.2.3 2010/11/15 15:11:54 uebayasi Exp $
#
# UVM options
@@ -44,5 +44,3 @@
file uvm/uvm_unix.c
file uvm/uvm_user.c
file uvm/uvm_vnode.c
-
-file common/pmap/pmap_common.c
Index: src/sys/uvm/uvm_pmap.h
diff -u src/sys/uvm/uvm_pmap.h:1.32.2.6 src/sys/uvm/uvm_pmap.h:1.32.2.7
--- src/sys/uvm/uvm_pmap.h:1.32.2.6 Sun Oct 31 03:46:20 2010
+++ src/sys/uvm/uvm_pmap.h Mon Nov 15 15:11:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pmap.h,v 1.32.2.6 2010/10/31 03:46:20 uebayasi Exp $ */
+/* $NetBSD: uvm_pmap.h,v 1.32.2.7 2010/11/15 15:11:54 uebayasi Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -155,9 +155,6 @@
struct pmap *pmap_create(void);
void pmap_destroy(pmap_t);
int pmap_enter(pmap_t, vaddr_t, paddr_t, vm_prot_t, u_int);
-paddr_t pmap_mmap(vaddr_t, off_t);
-void *pmap_physload_device(vaddr_t, size_t, int, int);
-void pmap_physunload_device(void *);
bool pmap_extract(pmap_t, vaddr_t, paddr_t *);
#if defined(PMAP_GROWKERNEL)
vaddr_t pmap_growkernel(vaddr_t);
