Module Name: src
Committed By: tsutsui
Date: Tue Dec 8 13:47:27 UTC 2009
Modified Files:
src/sys/arch/amiga/include: vmparam.h
src/sys/arch/atari/include: vmparam.h
src/sys/arch/cesfic/include: vmparam.h
src/sys/arch/hp300/include: vmparam.h
src/sys/arch/luna68k/include: vmparam.h
src/sys/arch/mac68k/include: vmparam.h
src/sys/arch/mvme68k/include: vmparam.h
src/sys/arch/news68k/include: vmparam.h
src/sys/arch/next68k/include: vmparam.h
src/sys/arch/x68k/include: vmparam.h
Log Message:
Use PGSHIFT from <machine/param.h> for PAGE_SHIFT.
We can assume PGSHIFT is always constant on current
m68k pmap_motorola implementation.
Also fix some leftover HP300 comments on some ports.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/amiga/include/vmparam.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/atari/include/vmparam.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/cesfic/include/vmparam.h
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/hp300/include/vmparam.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/luna68k/include/vmparam.h
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/mac68k/include/vmparam.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mvme68k/include/vmparam.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/news68k/include/vmparam.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/next68k/include/vmparam.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/x68k/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/amiga/include/vmparam.h
diff -u src/sys/arch/amiga/include/vmparam.h:1.38 src/sys/arch/amiga/include/vmparam.h:1.39
--- src/sys/arch/amiga/include/vmparam.h:1.38 Wed Aug 26 00:30:01 2009
+++ src/sys/arch/amiga/include/vmparam.h Tue Dec 8 13:47:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.38 2009/08/26 00:30:01 thorpej Exp $ */
+/* $NetBSD: vmparam.h,v 1.39 2009/12/08 13:47:26 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -81,14 +81,14 @@
#include <machine/pte.h>
/*
- * Machine dependent constants for HP300
+ * Machine dependent constants for amiga
*/
/*
* We use 8K pages on the Amiga. Override the PAGE_* definitions
* to be compie-time constants.
*/
-#define PAGE_SHIFT 13
+#define PAGE_SHIFT PGSHIFT
#define PAGE_SIZE (1 << PAGE_SHIFT)
#define PAGE_MASK (PAGE_SIZE - 1)
Index: src/sys/arch/atari/include/vmparam.h
diff -u src/sys/arch/atari/include/vmparam.h:1.25 src/sys/arch/atari/include/vmparam.h:1.26
--- src/sys/arch/atari/include/vmparam.h:1.25 Wed Aug 26 00:30:02 2009
+++ src/sys/arch/atari/include/vmparam.h Tue Dec 8 13:47:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.25 2009/08/26 00:30:02 thorpej Exp $ */
+/* $NetBSD: vmparam.h,v 1.26 2009/12/08 13:47:26 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -82,14 +82,14 @@
#include <machine/pte.h>
/*
- * Machine dependent constants for HP300
+ * Machine dependent constants for atari
*/
/*
* We use 8K pages on the Atari. Override the PAGE_* definitions
* to be compile-time constants.
*/
-#define PAGE_SHIFT 13
+#define PAGE_SHIFT PGSHIFT
#define PAGE_SIZE (1 << PAGE_SHIFT)
#define PAGE_MASK (PAGE_SIZE - 1)
Index: src/sys/arch/cesfic/include/vmparam.h
diff -u src/sys/arch/cesfic/include/vmparam.h:1.11 src/sys/arch/cesfic/include/vmparam.h:1.12
--- src/sys/arch/cesfic/include/vmparam.h:1.11 Wed Aug 26 00:30:02 2009
+++ src/sys/arch/cesfic/include/vmparam.h Tue Dec 8 13:47:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.11 2009/08/26 00:30:02 thorpej Exp $ */
+/* $NetBSD: vmparam.h,v 1.12 2009/12/08 13:47:26 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -87,7 +87,7 @@
* We use 4K pages on the cesfic. Override the PAGE_* definitions
* to be compile-time constants.
*/
-#define PAGE_SHIFT 12
+#define PAGE_SHIFT PGSHIFT
#define PAGE_SIZE (1 << PAGE_SHIFT)
#define PAGE_MASK (PAGE_SIZE - 1)
Index: src/sys/arch/hp300/include/vmparam.h
diff -u src/sys/arch/hp300/include/vmparam.h:1.34 src/sys/arch/hp300/include/vmparam.h:1.35
--- src/sys/arch/hp300/include/vmparam.h:1.34 Wed Aug 26 00:30:02 2009
+++ src/sys/arch/hp300/include/vmparam.h Tue Dec 8 13:47:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.34 2009/08/26 00:30:02 thorpej Exp $ */
+/* $NetBSD: vmparam.h,v 1.35 2009/12/08 13:47:26 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -87,7 +87,7 @@
* We use 4K pages on the hp300. Override the PAGE_* definitions
* to be compile-time constants.
*/
-#define PAGE_SHIFT 12
+#define PAGE_SHIFT PGSHIFT
#define PAGE_SIZE (1 << PAGE_SHIFT)
#define PAGE_MASK (PAGE_SIZE - 1)
Index: src/sys/arch/luna68k/include/vmparam.h
diff -u src/sys/arch/luna68k/include/vmparam.h:1.13 src/sys/arch/luna68k/include/vmparam.h:1.14
--- src/sys/arch/luna68k/include/vmparam.h:1.13 Wed Aug 26 00:30:02 2009
+++ src/sys/arch/luna68k/include/vmparam.h Tue Dec 8 13:47:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.13 2009/08/26 00:30:02 thorpej Exp $ */
+/* $NetBSD: vmparam.h,v 1.14 2009/12/08 13:47:27 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -80,10 +80,10 @@
#define _MACHINE_VMPARAM_H_
/*
- * We use 4K pages on the hp300. Override the PAGE_* definitions
+ * We use 4K pages on the luna68k. Override the PAGE_* definitions
* to be compile-time constants.
*/
-#define PAGE_SHIFT 12
+#define PAGE_SHIFT PGSHIFT
#define PAGE_SIZE (1 << PAGE_SHIFT)
#define PAGE_MASK (PAGE_SIZE - 1)
Index: src/sys/arch/mac68k/include/vmparam.h
diff -u src/sys/arch/mac68k/include/vmparam.h:1.39 src/sys/arch/mac68k/include/vmparam.h:1.40
--- src/sys/arch/mac68k/include/vmparam.h:1.39 Wed Aug 26 00:30:02 2009
+++ src/sys/arch/mac68k/include/vmparam.h Tue Dec 8 13:47:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.39 2009/08/26 00:30:02 thorpej Exp $ */
+/* $NetBSD: vmparam.h,v 1.40 2009/12/08 13:47:27 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -117,7 +117,7 @@
* We use 4K pages on the mac68k. Override the PAGE_* definitions
* to be compile-time constants.
*/
-#define PAGE_SHIFT 12
+#define PAGE_SHIFT PGSHIFT
#define PAGE_SIZE (1 << PAGE_SHIFT)
#define PAGE_MASK (PAGE_SIZE - 1)
Index: src/sys/arch/mvme68k/include/vmparam.h
diff -u src/sys/arch/mvme68k/include/vmparam.h:1.30 src/sys/arch/mvme68k/include/vmparam.h:1.31
--- src/sys/arch/mvme68k/include/vmparam.h:1.30 Wed Aug 26 00:30:03 2009
+++ src/sys/arch/mvme68k/include/vmparam.h Tue Dec 8 13:47:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.30 2009/08/26 00:30:03 thorpej Exp $ */
+/* $NetBSD: vmparam.h,v 1.31 2009/12/08 13:47:27 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -87,7 +87,7 @@
* We use 4K pages on the mvme68k. Override the PAGE_* definitions
* to be compile-time constants.
*/
-#define PAGE_SHIFT 12
+#define PAGE_SHIFT PGSHIFT
#define PAGE_SIZE (1 << PAGE_SHIFT)
#define PAGE_MASK (PAGE_SIZE - 1)
Index: src/sys/arch/news68k/include/vmparam.h
diff -u src/sys/arch/news68k/include/vmparam.h:1.15 src/sys/arch/news68k/include/vmparam.h:1.16
--- src/sys/arch/news68k/include/vmparam.h:1.15 Wed Aug 26 00:30:03 2009
+++ src/sys/arch/news68k/include/vmparam.h Tue Dec 8 13:47:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.15 2009/08/26 00:30:03 thorpej Exp $ */
+/* $NetBSD: vmparam.h,v 1.16 2009/12/08 13:47:27 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -87,7 +87,7 @@
* We use 4K pages on the news68k. Override the PAGE_* definitions
* to be compile time constants.
*/
-#define PAGE_SHIFT 12
+#define PAGE_SHIFT PGSHIFT
#define PAGE_SIZE (1 << PAGE_SHIFT)
#define PAGE_MASK (PAGE_SIZE - 1)
Index: src/sys/arch/next68k/include/vmparam.h
diff -u src/sys/arch/next68k/include/vmparam.h:1.20 src/sys/arch/next68k/include/vmparam.h:1.21
--- src/sys/arch/next68k/include/vmparam.h:1.20 Wed Aug 26 00:30:03 2009
+++ src/sys/arch/next68k/include/vmparam.h Tue Dec 8 13:47:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.20 2009/08/26 00:30:03 thorpej Exp $ */
+/* $NetBSD: vmparam.h,v 1.21 2009/12/08 13:47:27 tsutsui Exp $ */
/*
* This file was taken from from mvme68k/include/vmparam.h and
@@ -94,7 +94,7 @@
* We use 4K pages on the NeXT. Override the PAGE_* definitions
* to be compile-time constants.
*/
-#define PAGE_SHIFT 12
+#define PAGE_SHIFT PGSHIFT
#define PAGE_SIZE (1 << PAGE_SHIFT)
#define PAGE_MASK (PAGE_SIZE - 1)
Index: src/sys/arch/x68k/include/vmparam.h
diff -u src/sys/arch/x68k/include/vmparam.h:1.30 src/sys/arch/x68k/include/vmparam.h:1.31
--- src/sys/arch/x68k/include/vmparam.h:1.30 Wed Aug 26 00:30:03 2009
+++ src/sys/arch/x68k/include/vmparam.h Tue Dec 8 13:47:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.30 2009/08/26 00:30:03 thorpej Exp $ */
+/* $NetBSD: vmparam.h,v 1.31 2009/12/08 13:47:27 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -87,7 +87,7 @@
* We use 4K pages on the X68K. Override the PAGE_* definitions
* to be compile-time constants.
*/
-#define PAGE_SHIFT 12
+#define PAGE_SHIFT PGSHIFT
#define PAGE_SIZE (1 << PAGE_SHIFT)
#define PAGE_MASK (PAGE_SIZE - 1)
