Module Name: src
Committed By: uebayasi
Date: Fri Nov 12 07:59:28 UTC 2010
Modified Files:
src/sys/arch/alpha/alpha: pmap.c
src/sys/arch/arm/arm32: mem.c pmap.c
src/sys/arch/hppa/hppa: pmap.c
src/sys/arch/ia64/ia64: pmap.c
src/sys/arch/mips/mips: pmap.c
src/sys/arch/powerpc/oea: pmap.c
src/sys/arch/powerpc/powerpc: pmap_subr.c
src/sys/arch/sh3/sh3: pmap.c
src/sys/arch/sparc64/sparc64: pmap.c
src/sys/uvm: uvm_page.h
Log Message:
Put VM_PAGE_TO_MD() definition in one place. No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.254 -r1.255 src/sys/arch/alpha/alpha/pmap.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/arm32/mem.c
cvs rdiff -u -r1.218 -r1.219 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/hppa/hppa/pmap.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/ia64/ia64/pmap.c
cvs rdiff -u -r1.191 -r1.192 src/sys/arch/mips/mips/pmap.c
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/powerpc/oea/pmap.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/powerpc/pmap_subr.c
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/sh3/sh3/pmap.c
cvs rdiff -u -r1.268 -r1.269 src/sys/arch/sparc64/sparc64/pmap.c
cvs rdiff -u -r1.65 -r1.66 src/sys/uvm/uvm_page.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/alpha/pmap.c
diff -u src/sys/arch/alpha/alpha/pmap.c:1.254 src/sys/arch/alpha/alpha/pmap.c:1.255
--- src/sys/arch/alpha/alpha/pmap.c:1.254 Wed Nov 10 09:27:21 2010
+++ src/sys/arch/alpha/alpha/pmap.c Fri Nov 12 07:59:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.254 2010/11/10 09:27:21 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.255 2010/11/12 07:59:25 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.254 2010/11/10 09:27:21 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.255 2010/11/12 07:59:25 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -159,8 +159,6 @@
#include <machine/rpb.h>
#endif
-#define VM_PAGE_TO_MD(pg) (&(pg)->mdpage)
-
#ifdef DEBUG
#define PDB_FOLLOW 0x0001
#define PDB_INIT 0x0002
Index: src/sys/arch/arm/arm32/mem.c
diff -u src/sys/arch/arm/arm32/mem.c:1.29 src/sys/arch/arm/arm32/mem.c:1.30
--- src/sys/arch/arm/arm32/mem.c:1.29 Sat Nov 6 11:46:00 2010
+++ src/sys/arch/arm/arm32/mem.c Fri Nov 12 07:59:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mem.c,v 1.29 2010/11/06 11:46:00 uebayasi Exp $ */
+/* $NetBSD: mem.c,v 1.30 2010/11/12 07:59:25 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -76,7 +76,7 @@
#include "opt_compat_netbsd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.29 2010/11/06 11:46:00 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.30 2010/11/12 07:59:25 uebayasi Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -92,8 +92,6 @@
#include <uvm/uvm.h>
-#define VM_PAGE_TO_MD(pg) (&(pg)->mdpage)
-
extern vaddr_t memhook; /* in pmap.c (poor name!) */
extern kmutex_t memlock; /* in pmap.c */
extern void *zeropage; /* in pmap.c */
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.218 src/sys/arch/arm/arm32/pmap.c:1.219
--- src/sys/arch/arm/arm32/pmap.c:1.218 Wed Nov 10 09:27:22 2010
+++ src/sys/arch/arm/arm32/pmap.c Fri Nov 12 07:59:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.218 2010/11/10 09:27:22 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.219 2010/11/12 07:59:25 uebayasi Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -211,9 +211,7 @@
#include <machine/param.h>
#include <arm/arm32/katelib.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.218 2010/11/10 09:27:22 uebayasi Exp $");
-
-#define VM_PAGE_TO_MD(pg) (&(pg)->mdpage)
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.219 2010/11/12 07:59:25 uebayasi Exp $");
#ifdef PMAP_DEBUG
Index: src/sys/arch/hppa/hppa/pmap.c
diff -u src/sys/arch/hppa/hppa/pmap.c:1.77 src/sys/arch/hppa/hppa/pmap.c:1.78
--- src/sys/arch/hppa/hppa/pmap.c:1.77 Sat Oct 30 17:20:43 2010
+++ src/sys/arch/hppa/hppa/pmap.c Fri Nov 12 07:59:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.77 2010/10/30 17:20:43 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.78 2010/11/12 07:59:26 uebayasi Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.77 2010/10/30 17:20:43 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.78 2010/11/12 07:59:26 uebayasi Exp $");
#include "opt_cputype.h"
@@ -91,8 +91,6 @@
#include <ddb/db_output.h>
#endif
-#define VM_PAGE_TO_MD(pg) (&(pg)->mdpage)
-
#ifdef PMAPDEBUG
#define static /**/
Index: src/sys/arch/ia64/ia64/pmap.c
diff -u src/sys/arch/ia64/ia64/pmap.c:1.26 src/sys/arch/ia64/ia64/pmap.c:1.27
--- src/sys/arch/ia64/ia64/pmap.c:1.26 Wed Nov 10 09:27:22 2010
+++ src/sys/arch/ia64/ia64/pmap.c Fri Nov 12 07:59:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.26 2010/11/10 09:27:22 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.27 2010/11/12 07:59:26 uebayasi Exp $ */
/*-
@@ -85,7 +85,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.26 2010/11/10 09:27:22 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.27 2010/11/12 07:59:26 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,8 +102,6 @@
#include <machine/cpufunc.h>
#include <machine/md_var.h>
-#define VM_PAGE_TO_MD(pg) (&(pg)->mdpage)
-
/*
* Kernel virtual memory management.
Index: src/sys/arch/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.191 src/sys/arch/mips/mips/pmap.c:1.192
--- src/sys/arch/mips/mips/pmap.c:1.191 Wed Nov 10 09:27:23 2010
+++ src/sys/arch/mips/mips/pmap.c Fri Nov 12 07:59:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.191 2010/11/10 09:27:23 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.192 2010/11/12 07:59:26 uebayasi Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.191 2010/11/10 09:27:23 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.192 2010/11/12 07:59:26 uebayasi Exp $");
/*
* Manages physical address maps.
@@ -134,8 +134,6 @@
#include <mips/locore.h>
#include <mips/pte.h>
-#define VM_PAGE_TO_MD(pg) (&(pg)->mdpage)
-
CTASSERT(MIPS_KSEG0_START < 0);
CTASSERT((intptr_t)MIPS_PHYS_TO_KSEG0(0x1000) < 0);
CTASSERT(MIPS_KSEG1_START < 0);
Index: src/sys/arch/powerpc/oea/pmap.c
diff -u src/sys/arch/powerpc/oea/pmap.c:1.73 src/sys/arch/powerpc/oea/pmap.c:1.74
--- src/sys/arch/powerpc/oea/pmap.c:1.73 Wed Nov 10 09:27:23 2010
+++ src/sys/arch/powerpc/oea/pmap.c Fri Nov 12 07:59:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.73 2010/11/10 09:27:23 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.74 2010/11/12 07:59:26 uebayasi Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.73 2010/11/10 09:27:23 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.74 2010/11/12 07:59:26 uebayasi Exp $");
#define PMAP_NOOPNAMES
@@ -91,8 +91,6 @@
#include <powerpc/oea/spr.h>
#include <powerpc/oea/sr_601.h>
-#define VM_PAGE_TO_MD(pg) (&(pg)->mdpage)
-
#ifdef ALTIVEC
int pmap_use_altivec;
#endif
Index: src/sys/arch/powerpc/powerpc/pmap_subr.c
diff -u src/sys/arch/powerpc/powerpc/pmap_subr.c:1.24 src/sys/arch/powerpc/powerpc/pmap_subr.c:1.25
--- src/sys/arch/powerpc/powerpc/pmap_subr.c:1.24 Sat Nov 6 11:46:02 2010
+++ src/sys/arch/powerpc/powerpc/pmap_subr.c Fri Nov 12 07:59:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_subr.c,v 1.24 2010/11/06 11:46:02 uebayasi Exp $ */
+/* $NetBSD: pmap_subr.c,v 1.25 2010/11/12 07:59:27 uebayasi Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_subr.c,v 1.24 2010/11/06 11:46:02 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_subr.c,v 1.25 2010/11/12 07:59:27 uebayasi Exp $");
#include "opt_multiprocessor.h"
#include "opt_altivec.h"
@@ -51,8 +51,6 @@
#endif
#include <powerpc/psl.h>
-#define VM_PAGE_TO_MD(pg) (&(pg)->mdpage)
-
#define MFMSR() mfmsr()
#define MTMSR(psl) __asm volatile("sync; mtmsr %0; isync" :: "r"(psl))
Index: src/sys/arch/sh3/sh3/pmap.c
diff -u src/sys/arch/sh3/sh3/pmap.c:1.76 src/sys/arch/sh3/sh3/pmap.c:1.77
--- src/sys/arch/sh3/sh3/pmap.c:1.76 Wed Nov 10 09:27:24 2010
+++ src/sys/arch/sh3/sh3/pmap.c Fri Nov 12 07:59:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.76 2010/11/10 09:27:24 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.77 2010/11/12 07:59:27 uebayasi Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.76 2010/11/10 09:27:24 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.77 2010/11/12 07:59:27 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,8 +43,6 @@
#include <sh3/mmu.h>
#include <sh3/cache.h>
-#define VM_PAGE_TO_MD(pg) (&(pg)->mdpage)
-
#ifdef DEBUG
#define STATIC
#else
Index: src/sys/arch/sparc64/sparc64/pmap.c
diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.268 src/sys/arch/sparc64/sparc64/pmap.c:1.269
--- src/sys/arch/sparc64/sparc64/pmap.c:1.268 Tue Nov 2 13:09:29 2010
+++ src/sys/arch/sparc64/sparc64/pmap.c Fri Nov 12 07:59:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.268 2010/11/02 13:09:29 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.269 2010/11/12 07:59:27 uebayasi Exp $ */
/*
*
* Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.268 2010/11/02 13:09:29 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.269 2010/11/12 07:59:27 uebayasi Exp $");
#undef NO_VCACHE /* Don't forget the locked TLB in dostart */
#define HWREF
@@ -73,8 +73,6 @@
#define db_printf printf
#endif
-#define VM_PAGE_TO_MD(pg) (&(pg)->mdpage)
-
#define MEG (1<<20) /* 1MB */
#define KB (1<<10) /* 1KB */
Index: src/sys/uvm/uvm_page.h
diff -u src/sys/uvm/uvm_page.h:1.65 src/sys/uvm/uvm_page.h:1.66
--- src/sys/uvm/uvm_page.h:1.65 Fri Nov 12 05:23:41 2010
+++ src/sys/uvm/uvm_page.h Fri Nov 12 07:59:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.h,v 1.65 2010/11/12 05:23:41 uebayasi Exp $ */
+/* $NetBSD: uvm_page.h,v 1.66 2010/11/12 07:59:24 uebayasi Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -306,6 +306,10 @@
#define VM_PAGE_TO_PHYS(entry) uvm_vm_page_to_phys(entry)
+#ifdef __HAVE_VM_PAGE_MD
+#define VM_PAGE_TO_MD(pg) (&(pg)->mdpage)
+#endif
+
/*
* Compute the page color bucket for a given page.
*/
