Module Name: src
Committed By: uebayasi
Date: Tue Nov 16 02:50:15 UTC 2010
Modified Files:
src/sys/arch/hppa/include [uebayasi-xip]: pmap.h vmparam.h
src/sys/arch/i386/include [uebayasi-xip]: pmap.h vmparam.h
src/sys/arch/ia64/include [uebayasi-xip]: pmap.h vmparam.h
src/sys/arch/mips/include [uebayasi-xip]: pmap.h vmparam.h
src/sys/arch/powerpc/include/oea [uebayasi-xip]: vmparam.h
src/sys/arch/sh3/include [uebayasi-xip]: pmap.h vmparam.h
src/sys/arch/sparc/include [uebayasi-xip]: pmap.h vmparam.h
src/sys/arch/sparc64/include [uebayasi-xip]: pmap.h vmparam.h
src/sys/arch/vax/include [uebayasi-xip]: pmap.h vmparam.h
Log Message:
Sync with HEAD.
To generate a diff of this commit:
cvs rdiff -u -r1.23.2.3 -r1.23.2.4 src/sys/arch/hppa/include/pmap.h
cvs rdiff -u -r1.14.2.3 -r1.14.2.4 src/sys/arch/hppa/include/vmparam.h
cvs rdiff -u -r1.103.14.2 -r1.103.14.3 src/sys/arch/i386/include/pmap.h
cvs rdiff -u -r1.70.2.2 -r1.70.2.3 src/sys/arch/i386/include/vmparam.h
cvs rdiff -u -r1.6.2.1 -r1.6.2.2 src/sys/arch/ia64/include/pmap.h
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 src/sys/arch/ia64/include/vmparam.h
cvs rdiff -u -r1.57.2.1 -r1.57.2.2 src/sys/arch/mips/include/pmap.h
cvs rdiff -u -r1.44.2.2 -r1.44.2.3 src/sys/arch/mips/include/vmparam.h
cvs rdiff -u -r1.14.2.2 -r1.14.2.3 src/sys/arch/powerpc/include/oea/vmparam.h
cvs rdiff -u -r1.34 -r1.34.2.1 src/sys/arch/sh3/include/pmap.h
cvs rdiff -u -r1.19.2.3 -r1.19.2.4 src/sys/arch/sh3/include/vmparam.h
cvs rdiff -u -r1.88 -r1.88.2.1 src/sys/arch/sparc/include/pmap.h
cvs rdiff -u -r1.40.2.3 -r1.40.2.4 src/sys/arch/sparc/include/vmparam.h
cvs rdiff -u -r1.47.2.1 -r1.47.2.2 src/sys/arch/sparc64/include/pmap.h
cvs rdiff -u -r1.30.2.2 -r1.30.2.3 src/sys/arch/sparc64/include/vmparam.h
cvs rdiff -u -r1.77.2.1 -r1.77.2.2 src/sys/arch/vax/include/pmap.h
cvs rdiff -u -r1.45.2.2 -r1.45.2.3 src/sys/arch/vax/include/vmparam.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/arch/hppa/include/pmap.h
diff -u src/sys/arch/hppa/include/pmap.h:1.23.2.3 src/sys/arch/hppa/include/pmap.h:1.23.2.4
--- src/sys/arch/hppa/include/pmap.h:1.23.2.3 Tue Aug 17 06:44:33 2010
+++ src/sys/arch/hppa/include/pmap.h Tue Nov 16 02:50:13 2010
@@ -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_ */
Index: src/sys/arch/hppa/include/vmparam.h
diff -u src/sys/arch/hppa/include/vmparam.h:1.14.2.3 src/sys/arch/hppa/include/vmparam.h:1.14.2.4
--- src/sys/arch/hppa/include/vmparam.h:1.14.2.3 Fri Apr 30 14:39:27 2010
+++ src/sys/arch/hppa/include/vmparam.h Tue Nov 16 02:50:13 2010
@@ -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_ */
Index: src/sys/arch/i386/include/pmap.h
diff -u src/sys/arch/i386/include/pmap.h:1.103.14.2 src/sys/arch/i386/include/pmap.h:1.103.14.3
--- src/sys/arch/i386/include/pmap.h:1.103.14.2 Tue Aug 17 06:44:38 2010
+++ src/sys/arch/i386/include/pmap.h Tue Nov 16 02:50:13 2010
@@ -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_ */
Index: src/sys/arch/i386/include/vmparam.h
diff -u src/sys/arch/i386/include/vmparam.h:1.70.2.2 src/sys/arch/i386/include/vmparam.h:1.70.2.3
--- src/sys/arch/i386/include/vmparam.h:1.70.2.2 Mon Apr 26 06:19:04 2010
+++ src/sys/arch/i386/include/vmparam.h Tue Nov 16 02:50:13 2010
@@ -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_ */
Index: src/sys/arch/ia64/include/pmap.h
diff -u src/sys/arch/ia64/include/pmap.h:1.6.2.1 src/sys/arch/ia64/include/pmap.h:1.6.2.2
--- src/sys/arch/ia64/include/pmap.h:1.6.2.1 Thu Feb 25 04:33:44 2010
+++ src/sys/arch/ia64/include/pmap.h Tue Nov 16 02:50:13 2010
@@ -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_ */
Index: src/sys/arch/ia64/include/vmparam.h
diff -u src/sys/arch/ia64/include/vmparam.h:1.5.2.2 src/sys/arch/ia64/include/vmparam.h:1.5.2.3
--- src/sys/arch/ia64/include/vmparam.h:1.5.2.2 Mon Apr 26 06:19:04 2010
+++ src/sys/arch/ia64/include/vmparam.h Tue Nov 16 02:50:13 2010
@@ -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_ */
Index: src/sys/arch/mips/include/pmap.h
diff -u src/sys/arch/mips/include/pmap.h:1.57.2.1 src/sys/arch/mips/include/pmap.h:1.57.2.2
--- src/sys/arch/mips/include/pmap.h:1.57.2.1 Tue Aug 17 06:44:51 2010
+++ src/sys/arch/mips/include/pmap.h Tue Nov 16 02:50:14 2010
@@ -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_ */
Index: src/sys/arch/mips/include/vmparam.h
diff -u src/sys/arch/mips/include/vmparam.h:1.44.2.2 src/sys/arch/mips/include/vmparam.h:1.44.2.3
--- src/sys/arch/mips/include/vmparam.h:1.44.2.2 Mon Apr 26 06:19:04 2010
+++ src/sys/arch/mips/include/vmparam.h Tue Nov 16 02:50:14 2010
@@ -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
Index: src/sys/arch/powerpc/include/oea/vmparam.h
diff -u src/sys/arch/powerpc/include/oea/vmparam.h:1.14.2.2 src/sys/arch/powerpc/include/oea/vmparam.h:1.14.2.3
--- src/sys/arch/powerpc/include/oea/vmparam.h:1.14.2.2 Mon Apr 26 06:19:05 2010
+++ src/sys/arch/powerpc/include/oea/vmparam.h Tue Nov 16 02:50:14 2010
@@ -194,22 +194,4 @@
#define VM_FREELIST_FIRST16 2
#define VM_FREELIST_MAX 3
-#ifndef _LOCORE
-
-LIST_HEAD(pvo_head, pvo_entry);
-
-#define __HAVE_VM_PAGE_MD
-
-struct vm_page_md {
- struct pvo_head mdpg_pvoh;
- unsigned int mdpg_attrs;
-};
-
-#define VM_MDPAGE_INIT(md, pa) do { \
- LIST_INIT(&(md)->mdpg_pvoh); \
- (md)->mdpg_attrs = 0; \
-} while (/*CONSTCOND*/0)
-
-#endif /* _LOCORE */
-
#endif /* _POWERPC_OEA_VMPARAM_H_ */
Index: src/sys/arch/sh3/include/pmap.h
diff -u src/sys/arch/sh3/include/pmap.h:1.34 src/sys/arch/sh3/include/pmap.h:1.34.2.1
--- src/sys/arch/sh3/include/pmap.h:1.34 Wed Oct 21 21:12:02 2009
+++ src/sys/arch/sh3/include/pmap.h Tue Nov 16 02:50:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.34 2009/10/21 21:12:02 rmind Exp $ */
+/* $NetBSD: pmap.h,v 1.34.2.1 2010/11/16 02:50:14 uebayasi Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -83,4 +83,21 @@
pt_entry_t *__pmap_pte_lookup(pmap_t, vaddr_t);
pt_entry_t *__pmap_kpte_lookup(vaddr_t);
bool __pmap_pte_load(pmap_t, vaddr_t, int);
+
+/* pmap-specific data store in the vm_page structure. */
+#define __HAVE_VM_PAGE_MD
+#define PVH_REFERENCED 1
+#define PVH_MODIFIED 2
+
+struct pv_entry;
+struct vm_page_md {
+ SLIST_HEAD(, pv_entry) pvh_head;
+ int pvh_flags;
+};
+
+#define VM_MDPAGE_INIT(pvh, pa) \
+do { \
+ SLIST_INIT(&(pvh)->pvh_head); \
+ (pvh)->pvh_flags = 0; \
+} while (/*CONSTCOND*/0)
#endif /* !_SH3_PMAP_H_ */
Index: src/sys/arch/sh3/include/vmparam.h
diff -u src/sys/arch/sh3/include/vmparam.h:1.19.2.3 src/sys/arch/sh3/include/vmparam.h:1.19.2.4
--- src/sys/arch/sh3/include/vmparam.h:1.19.2.3 Mon Apr 26 06:19:05 2010
+++ src/sys/arch/sh3/include/vmparam.h Tue Nov 16 02:50:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.19.2.3 2010/04/26 06:19:05 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.19.2.4 2010/11/16 02:50:14 uebayasi Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -83,23 +83,4 @@
#define sh3_trunc_page(x) ((uint32_t)(x) & ~PGOFSET)
#define sh3_btop(x) ((uint32_t)(x) >> PGSHIFT)
#define sh3_ptob(x) ((uint32_t)(x) << PGSHIFT)
-
-/* pmap-specific data store in the vm_page structure. */
-#define __HAVE_VM_PAGE_MD
-#define PVH_REFERENCED 1
-#define PVH_MODIFIED 2
-
-#ifndef _LOCORE
-struct pv_entry;
-struct vm_page_md {
- SLIST_HEAD(, pv_entry) pvh_head;
- int pvh_flags;
-};
-
-#define VM_MDPAGE_INIT(pvh, pa) \
-do { \
- SLIST_INIT(&(pvh)->pvh_head); \
- (pvh)->pvh_flags = 0; \
-} while (/*CONSTCOND*/0)
-#endif /* _LOCORE */
#endif /* !_SH3_VMPARAM_H_ */
Index: src/sys/arch/sparc/include/pmap.h
diff -u src/sys/arch/sparc/include/pmap.h:1.88 src/sys/arch/sparc/include/pmap.h:1.88.2.1
--- src/sys/arch/sparc/include/pmap.h:1.88 Sat Nov 21 04:16:51 2009
+++ src/sys/arch/sparc/include/pmap.h Tue Nov 16 02:50:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.88 2009/11/21 04:16:51 rmind Exp $ */
+/* $NetBSD: pmap.h,v 1.88.2.1 2010/11/16 02:50:15 uebayasi Exp $ */
/*
* Copyright (c) 1996
@@ -390,6 +390,32 @@
#endif /* SUN4M || SUN4D */
+#define __HAVE_VM_PAGE_MD
+
+/*
+ * For each managed physical page, there is a list of all currently
+ * valid virtual mappings of that page. Since there is usually one
+ * (or zero) mapping per page, the table begins with an initial entry,
+ * rather than a pointer; this head entry is empty iff its pv_pmap
+ * field is NULL.
+ */
+struct vm_page_md {
+ struct pvlist {
+ struct pvlist *pv_next; /* next pvlist, if any */
+ struct pmap *pv_pmap; /* pmap of this va */
+ vaddr_t pv_va; /* virtual address */
+ int pv_flags; /* flags (below) */
+ } pvlisthead;
+};
+#define VM_MDPAGE_PVHEAD(pg) (&VM_PAGE_TO_MD(pg)->pvlisthead)
+
+#define VM_MDPAGE_INIT(md, pa) do { \
+ (md)->pvlisthead.pv_next = NULL; \
+ (md)->pvlisthead.pv_pmap = NULL; \
+ (md)->pvlisthead.pv_va = 0; \
+ (md)->pvlisthead.pv_flags = 0; \
+} while(/*CONSTCOND*/0)
+
#endif /* _KERNEL */
#endif /* _SPARC_PMAP_H_ */
Index: src/sys/arch/sparc/include/vmparam.h
diff -u src/sys/arch/sparc/include/vmparam.h:1.40.2.3 src/sys/arch/sparc/include/vmparam.h:1.40.2.4
--- src/sys/arch/sparc/include/vmparam.h:1.40.2.3 Mon Apr 26 06:19:05 2010
+++ src/sys/arch/sparc/include/vmparam.h Tue Nov 16 02:50:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.40.2.3 2010/04/26 06:19:05 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.40.2.4 2010/11/16 02:50:15 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -118,30 +118,4 @@
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
-#define __HAVE_VM_PAGE_MD
-
-/*
- * For each managed physical page, there is a list of all currently
- * valid virtual mappings of that page. Since there is usually one
- * (or zero) mapping per page, the table begins with an initial entry,
- * rather than a pointer; this head entry is empty iff its pv_pmap
- * field is NULL.
- */
-struct vm_page_md {
- struct pvlist {
- struct pvlist *pv_next; /* next pvlist, if any */
- struct pmap *pv_pmap; /* pmap of this va */
- vaddr_t pv_va; /* virtual address */
- int pv_flags; /* flags (below) */
- } pvlisthead;
-};
-#define VM_MDPAGE_PVHEAD(pg) (&VM_PAGE_TO_MD(pg)->pvlisthead)
-
-#define VM_MDPAGE_INIT(md, pa) do { \
- (md)->pvlisthead.pv_next = NULL; \
- (md)->pvlisthead.pv_pmap = NULL; \
- (md)->pvlisthead.pv_va = 0; \
- (md)->pvlisthead.pv_flags = 0; \
-} while(/*CONSTCOND*/0)
-
#endif /* _SPARC_VMPARAM_H_ */
Index: src/sys/arch/sparc64/include/pmap.h
diff -u src/sys/arch/sparc64/include/pmap.h:1.47.2.1 src/sys/arch/sparc64/include/pmap.h:1.47.2.2
--- src/sys/arch/sparc64/include/pmap.h:1.47.2.1 Fri Apr 30 14:39:52 2010
+++ src/sys/arch/sparc64/include/pmap.h Tue Nov 16 02:50:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.47.2.1 2010/04/30 14:39:52 uebayasi Exp $ */
+/* $NetBSD: pmap.h,v 1.47.2.2 2010/11/16 02:50:15 uebayasi Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -210,6 +210,30 @@
extern int phys_installed_size;
extern struct mem_region *phys_installed;
+#define __HAVE_VM_PAGE_MD
+
+/*
+ * For each struct vm_page, there is a list of all currently valid virtual
+ * mappings of that page. An entry is a pv_entry_t.
+ */
+struct pmap;
+typedef struct pv_entry {
+ struct pv_entry *pv_next; /* next pv_entry */
+ struct pmap *pv_pmap; /* pmap where mapping lies */
+ vaddr_t pv_va; /* virtual address for mapping */
+} *pv_entry_t;
+/* PV flags encoded in the low bits of the VA of the first pv_entry */
+
+struct vm_page_md {
+ struct pv_entry mdpg_pvh;
+};
+#define VM_MDPAGE_INIT(md, pa) \
+do { \
+ (md)->mdpg_pvh.pv_next = NULL; \
+ (md)->mdpg_pvh.pv_pmap = NULL; \
+ (md)->mdpg_pvh.pv_va = 0; \
+} while (/*CONSTCOND*/0)
+
#endif /* _KERNEL */
#endif /* _LOCORE */
Index: src/sys/arch/sparc64/include/vmparam.h
diff -u src/sys/arch/sparc64/include/vmparam.h:1.30.2.2 src/sys/arch/sparc64/include/vmparam.h:1.30.2.3
--- src/sys/arch/sparc64/include/vmparam.h:1.30.2.2 Mon Apr 26 06:19:05 2010
+++ src/sys/arch/sparc64/include/vmparam.h Tue Nov 16 02:50:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.30.2.2 2010/04/26 06:19:05 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.30.2.3 2010/11/16 02:50:15 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -169,32 +169,4 @@
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
-#ifdef _KERNEL
-
-#define __HAVE_VM_PAGE_MD
-
-/*
- * For each struct vm_page, there is a list of all currently valid virtual
- * mappings of that page. An entry is a pv_entry_t.
- */
-struct pmap;
-typedef struct pv_entry {
- struct pv_entry *pv_next; /* next pv_entry */
- struct pmap *pv_pmap; /* pmap where mapping lies */
- vaddr_t pv_va; /* virtual address for mapping */
-} *pv_entry_t;
-/* PV flags encoded in the low bits of the VA of the first pv_entry */
-
-struct vm_page_md {
- struct pv_entry mdpg_pvh;
-};
-#define VM_MDPAGE_INIT(md, pa) \
-do { \
- (md)->mdpg_pvh.pv_next = NULL; \
- (md)->mdpg_pvh.pv_pmap = NULL; \
- (md)->mdpg_pvh.pv_va = 0; \
-} while (/*CONSTCOND*/0)
-
-#endif /* _KERNEL */
-
#endif
Index: src/sys/arch/vax/include/pmap.h
diff -u src/sys/arch/vax/include/pmap.h:1.77.2.1 src/sys/arch/vax/include/pmap.h:1.77.2.2
--- src/sys/arch/vax/include/pmap.h:1.77.2.1 Thu May 27 14:47:30 2010
+++ src/sys/arch/vax/include/pmap.h Tue Nov 16 02:50:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.77.2.1 2010/05/27 14:47:30 uebayasi Exp $ */
+/* $NetBSD: pmap.h,v 1.77.2.2 2010/11/16 02:50:15 uebayasi Exp $ */
/*
* Copyright (c) 1991 Regents of the University of California.
@@ -289,4 +289,14 @@
void pmap_bootstrap(void);
vaddr_t pmap_map(vaddr_t, vaddr_t, vaddr_t, int);
+#if 0
+#define __HAVE_VM_PAGE_MD
+
+struct vm_page_md {
+ unsigned int md_attrs;
+};
+
+#define VM_MDPAGE_INIT(md, pa) ((md)->md_attrs = 0)
+#endif
+
#endif /* PMAP_H */
Index: src/sys/arch/vax/include/vmparam.h
diff -u src/sys/arch/vax/include/vmparam.h:1.45.2.2 src/sys/arch/vax/include/vmparam.h:1.45.2.3
--- src/sys/arch/vax/include/vmparam.h:1.45.2.2 Mon Apr 26 06:19:06 2010
+++ src/sys/arch/vax/include/vmparam.h Tue Nov 16 02:50:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.45.2.2 2010/04/26 06:19:06 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.45.2.3 2010/11/16 02:50:15 uebayasi Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -108,15 +108,4 @@
#define USRIOSIZE (8 * VAX_NPTEPG) /* 512MB */
#define VM_PHYS_SIZE (USRIOSIZE*VAX_NBPG)
-#if 0
-#define __HAVE_VM_PAGE_MD
-
-struct vm_page_md {
- unsigned int md_attrs;
-};
-
-#define VM_MDPAGE_INIT(md, pa) ((md)->md_attrs = 0)
-#endif
-
-
#endif
