Module Name: src
Committed By: uebayasi
Date: Wed Jul 7 16:35:26 UTC 2010
Modified Files:
src/sys/arch/alpha/alpha [uebayasi-xip]: pmap.c
src/sys/arch/arm/arm32 [uebayasi-xip]: mem.c pmap.c
src/sys/arch/hppa/hppa [uebayasi-xip]: pmap.c
src/sys/arch/ia64/ia64 [uebayasi-xip]: pmap.c
src/sys/conf [uebayasi-xip]: files
src/sys/uvm [uebayasi-xip]: uvm_bio.c uvm_fault.c uvm_km.c uvm_page.c
Log Message:
Clean up; merge options DIRECT_PAGE into options XIP.
To generate a diff of this commit:
cvs rdiff -u -r1.252.2.3 -r1.252.2.4 src/sys/arch/alpha/alpha/pmap.c
cvs rdiff -u -r1.26.6.4 -r1.26.6.5 src/sys/arch/arm/arm32/mem.c
cvs rdiff -u -r1.211.2.13 -r1.211.2.14 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.63.2.5 -r1.63.2.6 src/sys/arch/hppa/hppa/pmap.c
cvs rdiff -u -r1.24.2.3 -r1.24.2.4 src/sys/arch/ia64/ia64/pmap.c
cvs rdiff -u -r1.974.2.4 -r1.974.2.5 src/sys/conf/files
cvs rdiff -u -r1.68.2.3 -r1.68.2.4 src/sys/uvm/uvm_bio.c
cvs rdiff -u -r1.166.2.8 -r1.166.2.9 src/sys/uvm/uvm_fault.c
cvs rdiff -u -r1.104.2.5 -r1.104.2.6 src/sys/uvm/uvm_km.c
cvs rdiff -u -r1.153.2.40 -r1.153.2.41 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/sys/arch/alpha/alpha/pmap.c
diff -u src/sys/arch/alpha/alpha/pmap.c:1.252.2.3 src/sys/arch/alpha/alpha/pmap.c:1.252.2.4
--- src/sys/arch/alpha/alpha/pmap.c:1.252.2.3 Mon May 31 13:26:36 2010
+++ src/sys/arch/alpha/alpha/pmap.c Wed Jul 7 16:35:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.252.2.3 2010/05/31 13:26:36 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.252.2.4 2010/07/07 16:35:24 uebayasi Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008 The NetBSD Foundation, Inc.
@@ -137,12 +137,11 @@
#include "opt_lockdebug.h"
#include "opt_sysv.h"
#include "opt_multiprocessor.h"
-#include "opt_direct_page.h"
#include "opt_xip.h"
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.252.2.3 2010/05/31 13:26:36 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.252.2.4 2010/07/07 16:35:24 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/arm/arm32/mem.c
diff -u src/sys/arch/arm/arm32/mem.c:1.26.6.4 src/sys/arch/arm/arm32/mem.c:1.26.6.5
--- src/sys/arch/arm/arm32/mem.c:1.26.6.4 Mon May 31 13:26:36 2010
+++ src/sys/arch/arm/arm32/mem.c Wed Jul 7 16:35:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mem.c,v 1.26.6.4 2010/05/31 13:26:36 uebayasi Exp $ */
+/* $NetBSD: mem.c,v 1.26.6.5 2010/07/07 16:35:25 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -74,11 +74,10 @@
#include "opt_arm32_pmap.h"
#include "opt_compat_netbsd.h"
-#include "opt_direct_page.h"
#include "opt_xip.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.26.6.4 2010/05/31 13:26:36 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.26.6.5 2010/07/07 16:35:25 uebayasi Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -92,7 +91,7 @@
#include <machine/cpu.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
extern vaddr_t memhook; /* in pmap.c (poor name!) */
extern kmutex_t memlock; /* in pmap.c */
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.211.2.13 src/sys/arch/arm/arm32/pmap.c:1.211.2.14
--- src/sys/arch/arm/arm32/pmap.c:1.211.2.13 Mon May 31 13:26:36 2010
+++ src/sys/arch/arm/arm32/pmap.c Wed Jul 7 16:35:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.211.2.13 2010/05/31 13:26:36 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.211.2.14 2010/07/07 16:35:25 uebayasi Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -191,7 +191,6 @@
#include "opt_ddb.h"
#include "opt_lockdebug.h"
#include "opt_multiprocessor.h"
-#include "opt_direct_page.h"
#include "opt_xip.h"
#include <sys/param.h>
@@ -213,7 +212,7 @@
#include <machine/param.h>
#include <arm/arm32/katelib.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.13 2010/05/31 13:26:36 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.14 2010/07/07 16:35:25 uebayasi Exp $");
#ifdef PMAP_DEBUG
Index: src/sys/arch/hppa/hppa/pmap.c
diff -u src/sys/arch/hppa/hppa/pmap.c:1.63.2.5 src/sys/arch/hppa/hppa/pmap.c:1.63.2.6
--- src/sys/arch/hppa/hppa/pmap.c:1.63.2.5 Mon May 31 13:26:37 2010
+++ src/sys/arch/hppa/hppa/pmap.c Wed Jul 7 16:35:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.63.2.5 2010/05/31 13:26:37 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.63.2.6 2010/07/07 16:35:25 uebayasi Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -65,9 +65,8 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.63.2.5 2010/05/31 13:26:37 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.63.2.6 2010/07/07 16:35:25 uebayasi Exp $");
-#include "opt_direct_page.h"
#include "opt_xip.h"
#include "opt_cputype.h"
Index: src/sys/arch/ia64/ia64/pmap.c
diff -u src/sys/arch/ia64/ia64/pmap.c:1.24.2.3 src/sys/arch/ia64/ia64/pmap.c:1.24.2.4
--- src/sys/arch/ia64/ia64/pmap.c:1.24.2.3 Mon May 31 13:26:37 2010
+++ src/sys/arch/ia64/ia64/pmap.c Wed Jul 7 16:35:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.24.2.3 2010/05/31 13:26:37 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.24.2.4 2010/07/07 16:35:25 uebayasi Exp $ */
/*-
@@ -85,9 +85,8 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.24.2.3 2010/05/31 13:26:37 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.24.2.4 2010/07/07 16:35:25 uebayasi Exp $");
-#include "opt_direct_page.h"
#include "opt_xip.h"
#include <sys/param.h>
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.974.2.4 src/sys/conf/files:1.974.2.5
--- src/sys/conf/files:1.974.2.4 Mon May 31 13:26:37 2010
+++ src/sys/conf/files Wed Jul 7 16:35:25 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.974.2.4 2010/05/31 13:26:37 uebayasi Exp $
+# $NetBSD: files,v 1.974.2.5 2010/07/07 16:35:25 uebayasi Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20090313
@@ -119,10 +119,8 @@
defflag opt_wapbl.h WAPBL WAPBL_DEBUG
defparam opt_wapbl.h WAPBL_DEBUG_PRINT
-defflag opt_direct_page.h DIRECT_PAGE
-
# eXecute In Place
-defflag opt_xip.h XIP: DIRECT_PAGE
+defflag opt_xip.h XIP
# compatibility options
#
Index: src/sys/uvm/uvm_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.68.2.3 src/sys/uvm/uvm_bio.c:1.68.2.4
--- src/sys/uvm/uvm_bio.c:1.68.2.3 Mon May 31 13:26:38 2010
+++ src/sys/uvm/uvm_bio.c Wed Jul 7 16:35:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_bio.c,v 1.68.2.3 2010/05/31 13:26:38 uebayasi Exp $ */
+/* $NetBSD: uvm_bio.c,v 1.68.2.4 2010/07/07 16:35:26 uebayasi Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers.
@@ -34,11 +34,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.68.2.3 2010/05/31 13:26:38 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.68.2.4 2010/07/07 16:35:26 uebayasi Exp $");
#include "opt_uvmhist.h"
#include "opt_ubc.h"
-#include "opt_direct_page.h"
#include "opt_xip.h"
#include <sys/param.h>
Index: src/sys/uvm/uvm_fault.c
diff -u src/sys/uvm/uvm_fault.c:1.166.2.8 src/sys/uvm/uvm_fault.c:1.166.2.9
--- src/sys/uvm/uvm_fault.c:1.166.2.8 Wed Jul 7 14:29:37 2010
+++ src/sys/uvm/uvm_fault.c Wed Jul 7 16:35:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_fault.c,v 1.166.2.8 2010/07/07 14:29:37 uebayasi Exp $ */
+/* $NetBSD: uvm_fault.c,v 1.166.2.9 2010/07/07 16:35:26 uebayasi Exp $ */
/*
*
@@ -39,10 +39,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.166.2.8 2010/07/07 14:29:37 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.166.2.9 2010/07/07 16:35:26 uebayasi Exp $");
#include "opt_uvmhist.h"
-#include "opt_direct_page.h"
#include "opt_xip.h"
#include <sys/param.h>
Index: src/sys/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.104.2.5 src/sys/uvm/uvm_km.c:1.104.2.6
--- src/sys/uvm/uvm_km.c:1.104.2.5 Tue Jul 6 07:20:26 2010
+++ src/sys/uvm/uvm_km.c Wed Jul 7 16:35:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_km.c,v 1.104.2.5 2010/07/06 07:20:26 uebayasi Exp $ */
+/* $NetBSD: uvm_km.c,v 1.104.2.6 2010/07/07 16:35:26 uebayasi Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -127,10 +127,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.104.2.5 2010/07/06 07:20:26 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.104.2.6 2010/07/07 16:35:26 uebayasi Exp $");
#include "opt_uvmhist.h"
-#include "opt_direct_page.h"
#include "opt_xip.h"
#include <sys/param.h>
Index: src/sys/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.153.2.40 src/sys/uvm/uvm_page.c:1.153.2.41
--- src/sys/uvm/uvm_page.c:1.153.2.40 Wed Jul 7 14:29:38 2010
+++ src/sys/uvm/uvm_page.c Wed Jul 7 16:35:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.c,v 1.153.2.40 2010/07/07 14:29:38 uebayasi Exp $ */
+/* $NetBSD: uvm_page.c,v 1.153.2.41 2010/07/07 16:35:26 uebayasi Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -97,12 +97,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.40 2010/07/07 14:29:38 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.153.2.41 2010/07/07 16:35:26 uebayasi Exp $");
#include "opt_ddb.h"
#include "opt_uvmhist.h"
#include "opt_readahead.h"
-#include "opt_direct_page.h"
#include "opt_xip.h"
#include <sys/param.h>
@@ -135,7 +134,7 @@
static struct vm_physseg vm_physmem_store[VM_PHYSSEG_MAX];
static struct vm_physseg_freelist vm_physmem_freelist =
SIMPLEQ_HEAD_INITIALIZER(vm_physmem_freelist);
-#ifdef DIRECT_PAGE
+#ifdef XIP
struct vm_physseg *vm_physdev_ptrs[VM_PHYSSEG_MAX];
int vm_nphysdev = 0;
static struct vm_physseg vm_physdev_store[VM_PHYSSEG_MAX];
@@ -838,7 +837,7 @@
vm_nphysmem--;
}
-#ifdef DIRECT_PAGE
+#ifdef XIP
void *
uvm_page_physload_direct(paddr_t start, paddr_t end, paddr_t avail_start,
paddr_t avail_end, int prot, int flags)
@@ -854,7 +853,7 @@
seg->flags = flags; /* XXXUEBS BUS_SPACE_MAP_* */
/*
- * XIP page metadata
+ * XIP page metadata initialization
* - Only "phys_addr" and "vm_page_md" (== "PV" management) are used.
* - No "pageq" operation is done.
*/
@@ -941,7 +940,7 @@
SIMPLEQ_INSERT_TAIL(&vm_physmem_freelist,
&vm_physmem_store[lcv], list);
}
-#ifdef DIRECT_PAGE
+#ifdef XIP
for (lcv = 0; lcv < VM_PHYSSEG_MAX; lcv++) {
SIMPLEQ_INSERT_TAIL(&vm_physdev_freelist,
&vm_physdev_store[lcv], list);
@@ -1046,7 +1045,7 @@
pframe, NULL, offp);
}
-#ifdef DIRECT_PAGE
+#ifdef XIP
int
vm_physseg_find_direct(paddr_t pframe, int *offp)
{
@@ -1194,7 +1193,7 @@
int off;
int psi;
-#ifdef DIRECT_PAGE
+#ifdef XIP
psi = vm_physseg_find_direct(pf, &off);
if (psi != -1)
return(&vm_physdev_ptrs[psi]->pgs[off]);
@@ -2208,7 +2207,7 @@
{
return
-#ifdef DIRECT_PAGE
+#ifdef XIP
(vm_physseg_find_direct(atop(pa), NULL) != -1) ||
#endif
(vm_physseg_find(atop(pa), NULL) != -1);
