Module Name:    src
Committed By:   uebayasi
Date:           Tue Feb 23 15:27:57 UTC 2010

Modified Files:
        src/sys/arch/alpha/include [uebayasi-xip]: vmparam.h
        src/sys/arch/amd64/include [uebayasi-xip]: vmparam.h
        src/sys/arch/hppa/include [uebayasi-xip]: vmparam.h
        src/sys/arch/i386/include [uebayasi-xip]: vmparam.h
        src/sys/arch/ia64/include [uebayasi-xip]: vmparam.h
        src/sys/arch/mips/include [uebayasi-xip]: vmparam.h
        src/sys/arch/powerpc/include/oea [uebayasi-xip]: vmparam.h
        src/sys/arch/sh3/include [uebayasi-xip]: vmparam.h
        src/sys/arch/sparc/include [uebayasi-xip]: vmparam.h
        src/sys/arch/sparc64/include [uebayasi-xip]: vmparam.h
        src/sys/arch/vax/include [uebayasi-xip]: vmparam.h

Log Message:
Convert all VM_MDPAGE_INIT()'s to take struct vm_page_md * and paddr_t.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.2.1 src/sys/arch/alpha/include/vmparam.h
cvs rdiff -u -r1.22 -r1.22.2.1 src/sys/arch/amd64/include/vmparam.h
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/arch/hppa/include/vmparam.h
cvs rdiff -u -r1.70 -r1.70.2.1 src/sys/arch/i386/include/vmparam.h
cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/arch/ia64/include/vmparam.h
cvs rdiff -u -r1.44 -r1.44.2.1 src/sys/arch/mips/include/vmparam.h
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/arch/powerpc/include/oea/vmparam.h
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/arch/sh3/include/vmparam.h
cvs rdiff -u -r1.40 -r1.40.2.1 src/sys/arch/sparc/include/vmparam.h
cvs rdiff -u -r1.30 -r1.30.2.1 src/sys/arch/sparc64/include/vmparam.h
cvs rdiff -u -r1.45 -r1.45.2.1 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/alpha/include/vmparam.h
diff -u src/sys/arch/alpha/include/vmparam.h:1.33 src/sys/arch/alpha/include/vmparam.h:1.33.2.1
--- src/sys/arch/alpha/include/vmparam.h:1.33	Fri Mar  6 20:31:46 2009
+++ src/sys/arch/alpha/include/vmparam.h	Tue Feb 23 15:27:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.33 2009/03/06 20:31:46 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.33.2.1 2010/02/23 15:27:55 uebayasi Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -162,10 +162,10 @@
 	unsigned pvh_refcnt;
 };
 
-#define	VM_MDPAGE_INIT(pg)						\
+#define	VM_MDPAGE_INIT(md, pa)						\
 do {									\
-	(pg)->mdpage.pvh_list = NULL;					\
-	(pg)->mdpage.pvh_refcnt = 0;					\
+	(md)->pvh_list = NULL;						\
+	(md)->pvh_refcnt = 0;						\
 } while (/*CONSTCOND*/0)
 
 #endif	/* ! _ALPHA_VMPARAM_H_ */

Index: src/sys/arch/amd64/include/vmparam.h
diff -u src/sys/arch/amd64/include/vmparam.h:1.22 src/sys/arch/amd64/include/vmparam.h:1.22.2.1
--- src/sys/arch/amd64/include/vmparam.h:1.22	Sun Nov 22 21:41:03 2009
+++ src/sys/arch/amd64/include/vmparam.h	Tue Feb 23 15:27:55 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.22 2009/11/22 21:41:03 bouyer Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.22.2.1 2010/02/23 15:27:55 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -160,9 +160,9 @@
 #include <x86/pmap_pv.h>
 
 #define	__HAVE_VM_PAGE_MD
-#define	VM_MDPAGE_INIT(pg) \
-	memset(&(pg)->mdpage, 0, sizeof((pg)->mdpage)); \
-	PMAP_PAGE_INIT(&(pg)->mdpage.mp_pp)
+#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;

Index: src/sys/arch/hppa/include/vmparam.h
diff -u src/sys/arch/hppa/include/vmparam.h:1.14 src/sys/arch/hppa/include/vmparam.h:1.14.2.1
--- src/sys/arch/hppa/include/vmparam.h:1.14	Thu Apr 30 07:01:27 2009
+++ src/sys/arch/hppa/include/vmparam.h	Tue Feb 23 15:27:55 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.14 2009/04/30 07:01:27 skrll Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.14.2.1 2010/02/23 15:27:55 uebayasi Exp $	*/
 
 /*	$OpenBSD: vmparam.h,v 1.33 2006/06/04 17:21:24 miod Exp $	*/
 
@@ -112,12 +112,12 @@
 	int		pvh_aliases;	/* alias counting */
 };
 
-#define	VM_MDPAGE_INIT(pg) \
+#define	VM_MDPAGE_INIT(md, pa) \
 do {									\
-	mutex_init(&(pg)->mdpage.pvh_lock, MUTEX_NODEBUG, IPL_VM);	\
-	(pg)->mdpage.pvh_list = NULL;					\
-	(pg)->mdpage.pvh_attrs = 0;					\
-	(pg)->mdpage.pvh_aliases = 0;					\
+	mutex_init(&(md)->pvh_lock, MUTEX_NODEBUG, IPL_VM);		\
+	(md)->pvh_list = NULL;						\
+	(md)->pvh_attrs = 0;						\
+	(md)->pvh_aliases = 0;						\
 } while (0)
 #endif
 

Index: src/sys/arch/i386/include/vmparam.h
diff -u src/sys/arch/i386/include/vmparam.h:1.70 src/sys/arch/i386/include/vmparam.h:1.70.2.1
--- src/sys/arch/i386/include/vmparam.h:1.70	Fri Mar  6 20:31:49 2009
+++ src/sys/arch/i386/include/vmparam.h	Tue Feb 23 15:27:55 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.70 2009/03/06 20:31:49 joerg Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.70.2.1 2010/02/23 15:27:55 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -137,9 +137,9 @@
 #include <x86/pmap_pv.h>
 
 #define	__HAVE_VM_PAGE_MD
-#define	VM_MDPAGE_INIT(pg) \
-	memset(&(pg)->mdpage, 0, sizeof((pg)->mdpage)); \
-	PMAP_PAGE_INIT(&(pg)->mdpage.mp_pp)
+#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;

Index: src/sys/arch/ia64/include/vmparam.h
diff -u src/sys/arch/ia64/include/vmparam.h:1.5 src/sys/arch/ia64/include/vmparam.h:1.5.2.1
--- src/sys/arch/ia64/include/vmparam.h:1.5	Mon Jul 20 04:41:37 2009
+++ src/sys/arch/ia64/include/vmparam.h	Tue Feb 23 15:27:56 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.5 2009/07/20 04:41:37 kiyohara Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.5.2.1 2010/02/23 15:27:56 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -125,10 +125,10 @@
 	int pvh_attrs;			/* page attributes */
 };
 
-#define	VM_MDPAGE_INIT(pg)						\
+#define	VM_MDPAGE_INIT(md, pa)						\
 do {									\
-	TAILQ_INIT(&(pg)->mdpage.pv_list);				\
-	mutex_init(&(pg)->mdpage.pv_mutex, MUTEX_DEFAULT, IPL_NONE);	\
+	TAILQ_INIT(&(md)->pv_list);					\
+	mutex_init(&(md)->pv_mutex, MUTEX_DEFAULT, IPL_NONE);		\
 } while (/*CONSTCOND*/0)
 #endif /*_LOCORE*/
 

Index: src/sys/arch/mips/include/vmparam.h
diff -u src/sys/arch/mips/include/vmparam.h:1.44 src/sys/arch/mips/include/vmparam.h:1.44.2.1
--- src/sys/arch/mips/include/vmparam.h:1.44	Mon Dec 14 00:46:05 2009
+++ src/sys/arch/mips/include/vmparam.h	Tue Feb 23 15:27:56 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.44 2009/12/14 00:46:05 matt Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.44.2.1 2010/02/23 15:27:56 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -212,9 +212,9 @@
 	u_int pvh_attrs;		/* page attributes */
 };
 
-#define VM_MDPAGE_INIT(pg)						\
+#define VM_MDPAGE_INIT(md, pa)						\
 do {									\
-	(pg)->mdpage.pvh_list = NULL;					\
+	(md)->pvh_list = NULL;						\
 } while (/* CONSTCOND */ 0)
 
 #ifndef VM_NFREELIST

Index: src/sys/arch/powerpc/include/oea/vmparam.h
diff -u src/sys/arch/powerpc/include/oea/vmparam.h:1.14 src/sys/arch/powerpc/include/oea/vmparam.h:1.14.2.1
--- src/sys/arch/powerpc/include/oea/vmparam.h:1.14	Fri Mar  6 20:31:51 2009
+++ src/sys/arch/powerpc/include/oea/vmparam.h	Tue Feb 23 15:27:56 2010
@@ -206,9 +206,9 @@
 	unsigned int mdpg_attrs; 
 };
 
-#define	VM_MDPAGE_INIT(pg) do {			\
-	LIST_INIT(&(pg)->mdpage.mdpg_pvoh);	\
-	(pg)->mdpage.mdpg_attrs = 0;		\
+#define	VM_MDPAGE_INIT(md, pa) do {		\
+	LIST_INIT(&(md)->mdpg_pvoh);		\
+	(md)->mdpg_attrs = 0;			\
 } while (/*CONSTCOND*/0)
 
 #endif	/* _LOCORE */

Index: src/sys/arch/sh3/include/vmparam.h
diff -u src/sys/arch/sh3/include/vmparam.h:1.19 src/sys/arch/sh3/include/vmparam.h:1.19.2.1
--- src/sys/arch/sh3/include/vmparam.h:1.19	Fri Mar  6 20:31:51 2009
+++ src/sys/arch/sh3/include/vmparam.h	Tue Feb 23 15:27:56 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.19 2009/03/06 20:31:51 joerg Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.19.2.1 2010/02/23 15:27:56 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -97,9 +97,8 @@
 	int pvh_flags;
 };
 
-#define	VM_MDPAGE_INIT(pg)						\
+#define	VM_MDPAGE_INIT(pvh, pa)						\
 do {									\
-	struct vm_page_md *pvh = &(pg)->mdpage;				\
 	SLIST_INIT(&pvh->pvh_head);					\
 	pvh->pvh_flags = 0;						\
 } while (/*CONSTCOND*/0)

Index: src/sys/arch/sparc/include/vmparam.h
diff -u src/sys/arch/sparc/include/vmparam.h:1.40 src/sys/arch/sparc/include/vmparam.h:1.40.2.1
--- src/sys/arch/sparc/include/vmparam.h:1.40	Fri Mar  6 20:31:52 2009
+++ src/sys/arch/sparc/include/vmparam.h	Tue Feb 23 15:27:56 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.40 2009/03/06 20:31:52 joerg Exp $ */
+/*	$NetBSD: vmparam.h,v 1.40.2.1 2010/02/23 15:27:56 uebayasi Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -138,11 +138,11 @@
 };
 #define VM_MDPAGE_PVHEAD(pg)	(&(pg)->mdpage.pvlisthead)
 
-#define VM_MDPAGE_INIT(pg) do {				\
-	(pg)->mdpage.pvlisthead.pv_next = NULL;		\
-	(pg)->mdpage.pvlisthead.pv_pmap = NULL;		\
-	(pg)->mdpage.pvlisthead.pv_va = 0;		\
-	(pg)->mdpage.pvlisthead.pv_flags = 0;		\
+#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/vmparam.h
diff -u src/sys/arch/sparc64/include/vmparam.h:1.30 src/sys/arch/sparc64/include/vmparam.h:1.30.2.1
--- src/sys/arch/sparc64/include/vmparam.h:1.30	Fri Mar  6 20:31:52 2009
+++ src/sys/arch/sparc64/include/vmparam.h	Tue Feb 23 15:27:56 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.30 2009/03/06 20:31:52 joerg Exp $ */
+/*	$NetBSD: vmparam.h,v 1.30.2.1 2010/02/23 15:27:56 uebayasi Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -189,11 +189,11 @@
 struct vm_page_md {
 	struct pv_entry mdpg_pvh;
 };
-#define	VM_MDPAGE_INIT(pg)						\
+#define	VM_MDPAGE_INIT(md, pa)						\
 do {									\
-	(pg)->mdpage.mdpg_pvh.pv_next = NULL;				\
-	(pg)->mdpage.mdpg_pvh.pv_pmap = NULL;				\
-	(pg)->mdpage.mdpg_pvh.pv_va = 0;				\
+	(md)->mdpg_pvh.pv_next = NULL;					\
+	(md)->mdpg_pvh.pv_pmap = NULL;					\
+	(md)->mdpg_pvh.pv_va = 0;					\
 } while (/*CONSTCOND*/0)
 
 #endif	/* _KERNEL */

Index: src/sys/arch/vax/include/vmparam.h
diff -u src/sys/arch/vax/include/vmparam.h:1.45 src/sys/arch/vax/include/vmparam.h:1.45.2.1
--- src/sys/arch/vax/include/vmparam.h:1.45	Fri Mar  6 20:31:53 2009
+++ src/sys/arch/vax/include/vmparam.h	Tue Feb 23 15:27:57 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.45 2009/03/06 20:31:53 joerg Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.45.2.1 2010/02/23 15:27:57 uebayasi Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -116,7 +116,7 @@
 	unsigned int md_attrs;
 };
 
-#define	VM_MDPAGE_INIT(pg)	((pg)->mdpage.md_attrs = 0)
+#define	VM_MDPAGE_INIT(md, pa)	((md)->md_attrs = 0)
 #endif
 
 

Reply via email to