Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/uebayasi-xip]: src/sys/arch Sync with HEAD.
details: https://anonhg.NetBSD.org/src/rev/5febd18341c0
branches: uebayasi-xip
changeset: 751858:5febd18341c0
user: uebayasi <uebayasi%NetBSD.org@localhost>
date: Tue Nov 16 02:47:24 2010 +0000
description:
Sync with HEAD.
diffstat:
sys/arch/hppa/include/pmap.h | 21 ++++++++++++++++++++-
sys/arch/hppa/include/vmparam.h | 23 +----------------------
sys/arch/i386/include/pmap.h | 13 ++++++++++++-
sys/arch/i386/include/vmparam.h | 13 +------------
sys/arch/ia64/include/pmap.h | 19 +++++++++++++++++++
sys/arch/ia64/include/vmparam.h | 24 +-----------------------
sys/arch/m68k/m68k/bus_dma.c | 6 +++---
sys/arch/mips/include/pmap.h | 17 ++++++++++++++++-
sys/arch/mips/include/vmparam.h | 17 +----------------
sys/arch/mips/mips/bus_dma.c | 6 +++---
sys/arch/mips/mips/cache_r5k.c | 12 ++++++------
sys/arch/powerpc/include/oea/vmparam.h | 18 ------------------
sys/arch/sh3/include/pmap.h | 19 ++++++++++++++++++-
sys/arch/sh3/include/vmparam.h | 21 +--------------------
sys/arch/sparc/include/pmap.h | 28 +++++++++++++++++++++++++++-
sys/arch/sparc/include/vmparam.h | 28 +---------------------------
sys/arch/sparc64/include/pmap.h | 26 +++++++++++++++++++++++++-
sys/arch/sparc64/include/vmparam.h | 30 +-----------------------------
sys/arch/vax/include/pmap.h | 12 +++++++++++-
sys/arch/vax/include/vmparam.h | 13 +------------
20 files changed, 168 insertions(+), 198 deletions(-)
diffs (truncated from 640 to 300 lines):
diff -r a4d4f68945fa -r 5febd18341c0 sys/arch/hppa/include/pmap.h
--- a/sys/arch/hppa/include/pmap.h Mon Nov 15 17:32:01 2010 +0000
+++ b/sys/arch/hppa/include/pmap.h Tue Nov 16 02:47:24 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.23.2.3 2010/08/17 06:44:33 uebayasi Exp $ */
+/* $NetBSD: pmap.h,v 1.23.2.4 2010/11/16 02:50:13 uebayasi Exp $ */
/* $OpenBSD: pmap.h,v 1.35 2007/12/14 18:32:23 deraadt Exp $ */
@@ -192,6 +192,25 @@
((((va) & 0xc0000000) != 0xc0000000) ? \
(pmap)->pm_space : HPPA_SID_KERNEL)
+#define __HAVE_VM_PAGE_MD
+
+struct pv_entry;
+
+struct vm_page_md {
+ kmutex_t pvh_lock; /* locks every pv on this list */
+ struct pv_entry *pvh_list; /* head of list (locked by pvh_lock) */
+ u_int pvh_attrs; /* to preserve ref/mod */
+ int pvh_aliases; /* alias counting */
+};
+
+#define VM_MDPAGE_INIT(md, pa) \
+do { \
+ mutex_init(&(md)->pvh_lock, MUTEX_NODEBUG, IPL_VM); \
+ (md)->pvh_list = NULL; \
+ (md)->pvh_attrs = 0; \
+ (md)->pvh_aliases = 0; \
+} while (0)
+
#endif /* _KERNEL */
#endif /* _HPPA_PMAP_H_ */
diff -r a4d4f68945fa -r 5febd18341c0 sys/arch/hppa/include/vmparam.h
--- a/sys/arch/hppa/include/vmparam.h Mon Nov 15 17:32:01 2010 +0000
+++ b/sys/arch/hppa/include/vmparam.h Tue Nov 16 02:47:24 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.14.2.3 2010/04/30 14:39:27 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.14.2.4 2010/11/16 02:50:13 uebayasi Exp $ */
/* $OpenBSD: vmparam.h,v 1.33 2006/06/04 17:21:24 miod Exp $ */
@@ -99,25 +99,4 @@
#define VM_FREELIST_DEFAULT 0
#define VM_FREELIST_ISADMA 1
-#if defined(_KERNEL) && !defined(_LOCORE)
-#define __HAVE_VM_PAGE_MD
-
-struct pv_entry;
-
-struct vm_page_md {
- kmutex_t pvh_lock; /* locks every pv on this list */
- struct pv_entry *pvh_list; /* head of list (locked by pvh_lock) */
- u_int pvh_attrs; /* to preserve ref/mod */
- int pvh_aliases; /* alias counting */
-};
-
-#define VM_MDPAGE_INIT(md, pa) \
-do { \
- mutex_init(&(md)->pvh_lock, MUTEX_NODEBUG, IPL_VM); \
- (md)->pvh_list = NULL; \
- (md)->pvh_attrs = 0; \
- (md)->pvh_aliases = 0; \
-} while (0)
-#endif
-
#endif /* _HPPA_VMPARAM_H_ */
diff -r a4d4f68945fa -r 5febd18341c0 sys/arch/i386/include/pmap.h
--- a/sys/arch/i386/include/pmap.h Mon Nov 15 17:32:01 2010 +0000
+++ b/sys/arch/i386/include/pmap.h Tue Nov 16 02:47:24 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.103.14.2 2010/08/17 06:44:38 uebayasi Exp $ */
+/* $NetBSD: pmap.h,v 1.103.14.3 2010/11/16 02:50:13 uebayasi Exp $ */
/*
*
@@ -447,4 +447,15 @@
int pmap_exec_fixup(struct vm_map *, struct trapframe *, struct pcb *);
void pmap_ldt_cleanup(struct lwp *);
+#include <x86/pmap_pv.h>
+
+#define __HAVE_VM_PAGE_MD
+#define VM_MDPAGE_INIT(md, pa) \
+ memset((md), 0, sizeof(*(md))); \
+ PMAP_PAGE_INIT(&(md)->mp_pp)
+
+struct vm_page_md {
+ struct pmap_page mp_pp;
+};
+
#endif /* _I386_PMAP_H_ */
diff -r a4d4f68945fa -r 5febd18341c0 sys/arch/i386/include/vmparam.h
--- a/sys/arch/i386/include/vmparam.h Mon Nov 15 17:32:01 2010 +0000
+++ b/sys/arch/i386/include/vmparam.h Tue Nov 16 02:47:24 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.70.2.2 2010/04/26 06:19:04 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.70.2.3 2010/11/16 02:50:13 uebayasi Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -133,15 +133,4 @@
#endif /* XEN */
#define VM_FREELIST_DEFAULT 0
-#include <x86/pmap_pv.h>
-
-#define __HAVE_VM_PAGE_MD
-#define VM_MDPAGE_INIT(md, pa) \
- memset((md), 0, sizeof(*(md))); \
- PMAP_PAGE_INIT(&(md)->mp_pp)
-
-struct vm_page_md {
- struct pmap_page mp_pp;
-};
-
#endif /* _I386_VMPARAM_H_ */
diff -r a4d4f68945fa -r 5febd18341c0 sys/arch/ia64/include/pmap.h
--- a/sys/arch/ia64/include/pmap.h Mon Nov 15 17:32:01 2010 +0000
+++ b/sys/arch/ia64/include/pmap.h Tue Nov 16 02:47:24 2010 +0000
@@ -146,4 +146,23 @@
#define PMAP_VHPT_LOG2SIZE 16
+#include <sys/queue.h>
+#include <sys/mutex.h>
+/*
+ * pmap-specific data store in the vm_page structure.
+ */
+#define __HAVE_VM_PAGE_MD
+struct vm_page_md {
+ TAILQ_HEAD(,pv_entry) pv_list; /* pv_entry list */
+ int pv_list_count;
+ kmutex_t pv_mutex; /* lock on this head */
+ int pvh_attrs; /* page attributes */
+};
+
+#define VM_MDPAGE_INIT(md, pa) \
+do { \
+ TAILQ_INIT(&(md)->pv_list); \
+ mutex_init(&(md)->pv_mutex, MUTEX_DEFAULT, IPL_NONE); \
+} while (/*CONSTCOND*/0)
+
#endif /* _PMAP_MACHINE_ */
diff -r a4d4f68945fa -r 5febd18341c0 sys/arch/ia64/include/vmparam.h
--- a/sys/arch/ia64/include/vmparam.h Mon Nov 15 17:32:01 2010 +0000
+++ b/sys/arch/ia64/include/vmparam.h Tue Nov 16 02:47:24 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.5.2.2 2010/04/26 06:19:04 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.5.2.3 2010/11/16 02:50:13 uebayasi Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -109,26 +109,4 @@
/* virtual sizes (bytes) for various kernel submaps */
#define VM_PHYS_SIZE (USRIOSIZE*PAGE_SIZE)
-#ifndef _LOCORE
-
-#include <sys/queue.h>
-#include <sys/mutex.h>
-/*
- * pmap-specific data store in the vm_page structure.
- */
-#define __HAVE_VM_PAGE_MD
-struct vm_page_md {
- TAILQ_HEAD(,pv_entry) pv_list; /* pv_entry list */
- int pv_list_count;
- kmutex_t pv_mutex; /* lock on this head */
- int pvh_attrs; /* page attributes */
-};
-
-#define VM_MDPAGE_INIT(md, pa) \
-do { \
- TAILQ_INIT(&(md)->pv_list); \
- mutex_init(&(md)->pv_mutex, MUTEX_DEFAULT, IPL_NONE); \
-} while (/*CONSTCOND*/0)
-#endif /*_LOCORE*/
-
#endif /* _VMPARAM_H_ */
diff -r a4d4f68945fa -r 5febd18341c0 sys/arch/m68k/m68k/bus_dma.c
--- a/sys/arch/m68k/m68k/bus_dma.c Mon Nov 15 17:32:01 2010 +0000
+++ b/sys/arch/m68k/m68k/bus_dma.c Tue Nov 16 02:47:24 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.29.18.1 2010/08/17 06:44:47 uebayasi Exp $ */
+/* $NetBSD: bus_dma.c,v 1.29.18.2 2010/11/16 02:47:24 uebayasi Exp $ */
/*
* This file was taken from from alpha/common/bus_dma.c
@@ -41,7 +41,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.29.18.1 2010/08/17 06:44:47 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.29.18.2 2010/11/16 02:47:24 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@
#include <sys/proc.h>
#include <sys/mbuf.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#include <machine/cpu.h>
diff -r a4d4f68945fa -r 5febd18341c0 sys/arch/mips/include/pmap.h
--- a/sys/arch/mips/include/pmap.h Mon Nov 15 17:32:01 2010 +0000
+++ b/sys/arch/mips/include/pmap.h Tue Nov 16 02:47:24 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.57.2.1 2010/08/17 06:44:51 uebayasi Exp $ */
+/* $NetBSD: pmap.h,v 1.57.2.2 2010/11/16 02:50:14 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -205,5 +205,20 @@
#define PGC_NOCACHE 0x4000000000000000ULL
#endif
+#define __HAVE_VM_PAGE_MD
+
+/*
+ * pmap-specific data stored in the vm_page structure.
+ */
+struct vm_page_md {
+ struct pv_entry *pvh_list; /* pv_entry list */
+ u_int pvh_attrs; /* page attributes */
+};
+
+#define VM_MDPAGE_INIT(md, pa) \
+do { \
+ (md)->pvh_list = NULL; \
+} while (/* CONSTCOND */ 0)
+
#endif /* _KERNEL */
#endif /* _MIPS_PMAP_H_ */
diff -r a4d4f68945fa -r 5febd18341c0 sys/arch/mips/include/vmparam.h
--- a/sys/arch/mips/include/vmparam.h Mon Nov 15 17:32:01 2010 +0000
+++ b/sys/arch/mips/include/vmparam.h Tue Nov 16 02:47:24 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.44.2.2 2010/04/26 06:19:04 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.44.2.3 2010/11/16 02:50:14 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -201,21 +201,6 @@
/* VM_PHYSSEG_MAX defined by platform-dependent code. */
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
-#define __HAVE_VM_PAGE_MD
-
-/*
- * pmap-specific data stored in the vm_page structure.
- */
-struct vm_page_md {
- struct pv_entry *pvh_list; /* pv_entry list */
- u_int pvh_attrs; /* page attributes */
-};
-
-#define VM_MDPAGE_INIT(md, pa) \
-do { \
- (md)->pvh_list = NULL; \
-} while (/* CONSTCOND */ 0)
-
#ifndef VM_NFREELIST
#define VM_NFREELIST 16 /* 16 distinct memory segments */
#define VM_FREELIST_DEFAULT 0
diff -r a4d4f68945fa -r 5febd18341c0 sys/arch/mips/mips/bus_dma.c
--- a/sys/arch/mips/mips/bus_dma.c Mon Nov 15 17:32:01 2010 +0000
+++ b/sys/arch/mips/mips/bus_dma.c Tue Nov 16 02:47:24 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.23 2009/12/14 00:46:05 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.23.2.1 2010/11/16 02:47:40 uebayasi Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.23 2009/12/14 00:46:05 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.23.2.1 2010/11/16 02:47:40 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@
#include <sys/proc.h>
#include <sys/mbuf.h>
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
#include <mips/cache.h>
#ifdef _LP64
diff -r a4d4f68945fa -r 5febd18341c0 sys/arch/mips/mips/cache_r5k.c
--- a/sys/arch/mips/mips/cache_r5k.c Mon Nov 15 17:32:01 2010 +0000
Home |
Main Index |
Thread Index |
Old Index