[src/trunk]: src/sys/arch Don't define APTE_BASE if ARM32_PMAP_NEW is defined...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/85b625464bea
branches:  trunk
changeset: 546396:85b625464bea
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Apr 28 01:34:28 2003 +0000

description:
Don't define APTE_BASE if ARM32_PMAP_NEW is defined; the new pmap
doesn't use it.

diffstat:

 sys/arch/acorn32/include/vmparam.h   |  4 +++-
 sys/arch/cats/include/vmparam.h      |  4 +++-
 sys/arch/evbarm/include/vmparam.h    |  4 +++-
 sys/arch/hpcarm/include/vmparam.h    |  4 +++-
 sys/arch/netwinder/include/vmparam.h |  4 +++-
 sys/arch/shark/include/vmparam.h     |  4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diffs (114 lines):

diff -r a59b719b979a -r 85b625464bea sys/arch/acorn32/include/vmparam.h
--- a/sys/arch/acorn32/include/vmparam.h        Sun Apr 27 22:33:49 2003 +0000
+++ b/sys/arch/acorn32/include/vmparam.h        Mon Apr 28 01:34:28 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.12 2003/04/02 07:35:54 thorpej Exp $     */
+/*     $NetBSD: vmparam.h,v 1.13 2003/04/28 01:34:28 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -52,7 +52,9 @@
 
 /* Various constants used by the MD code*/
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x00000000)
+#ifndef ARM32_PMAP_NEW
 #define        APTE_BASE               (KERNEL_BASE + 0x00c00000)
+#endif
 #define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
 /*
  * The Kernel VM Size varies depending on the machine depending on how
diff -r a59b719b979a -r 85b625464bea sys/arch/cats/include/vmparam.h
--- a/sys/arch/cats/include/vmparam.h   Sun Apr 27 22:33:49 2003 +0000
+++ b/sys/arch/cats/include/vmparam.h   Mon Apr 28 01:34:28 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.17 2003/04/02 07:35:56 thorpej Exp $     */
+/*     $NetBSD: vmparam.h,v 1.18 2003/04/28 01:34:29 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -52,7 +52,9 @@
 
 /* Various constants used by the MD code*/
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x00000000)
+#ifndef ARM32_PMAP_NEW
 #define        APTE_BASE               (KERNEL_BASE + 0x00c00000)
+#endif
 #define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
 /*
  * The Kernel VM Size varies depending on the machine depending on how
diff -r a59b719b979a -r 85b625464bea sys/arch/evbarm/include/vmparam.h
--- a/sys/arch/evbarm/include/vmparam.h Sun Apr 27 22:33:49 2003 +0000
+++ b/sys/arch/evbarm/include/vmparam.h Mon Apr 28 01:34:28 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.14 2003/04/02 07:35:57 thorpej Exp $     */
+/*     $NetBSD: vmparam.h,v 1.15 2003/04/28 01:34:29 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -52,7 +52,9 @@
 
 /* Various constants used by the MD code*/
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x00200000)
+#ifndef ARM32_PMAP_NEW
 #define        APTE_BASE               (KERNEL_BASE + 0x00c00000)
+#endif
 #define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
 /*
  * The Kernel VM Size varies depending on the machine depending on how
diff -r a59b719b979a -r 85b625464bea sys/arch/hpcarm/include/vmparam.h
--- a/sys/arch/hpcarm/include/vmparam.h Sun Apr 27 22:33:49 2003 +0000
+++ b/sys/arch/hpcarm/include/vmparam.h Mon Apr 28 01:34:28 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.19 2003/04/02 07:35:58 thorpej Exp $     */
+/*     $NetBSD: vmparam.h,v 1.20 2003/04/28 01:34:29 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -52,7 +52,9 @@
 
 /* Various constants used by the MD code*/
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x00040000)
+#ifndef ARM32_PMAP_NEW
 #define        APTE_BASE               (KERNEL_BASE + 0x00800000)
+#endif
 #define        KERNEL_VM_BASE          (KERNEL_BASE + 0x00c00000)
 
 /*
diff -r a59b719b979a -r 85b625464bea sys/arch/netwinder/include/vmparam.h
--- a/sys/arch/netwinder/include/vmparam.h      Sun Apr 27 22:33:49 2003 +0000
+++ b/sys/arch/netwinder/include/vmparam.h      Mon Apr 28 01:34:28 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.15 2003/04/02 07:36:01 thorpej Exp $     */
+/*     $NetBSD: vmparam.h,v 1.16 2003/04/28 01:34:31 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -52,7 +52,9 @@
 
 /* Various constants used by the MD code*/
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x0000c000)
+#ifndef ARM32_PMAP_NEW
 #define        APTE_BASE               (KERNEL_BASE + 0x00c00000)
+#endif
 #define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
 /*
  * The Kernel VM Size varies depending on the machine depending on how
diff -r a59b719b979a -r 85b625464bea sys/arch/shark/include/vmparam.h
--- a/sys/arch/shark/include/vmparam.h  Sun Apr 27 22:33:49 2003 +0000
+++ b/sys/arch/shark/include/vmparam.h  Mon Apr 28 01:34:28 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.7 2003/04/02 07:36:03 thorpej Exp $      */
+/*     $NetBSD: vmparam.h,v 1.8 2003/04/28 01:34:32 thorpej Exp $      */
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -52,7 +52,9 @@
 
 /* Various constants used by the MD code */
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x00000000)
+#ifndef ARM32_PMAP_NEW
 #define        APTE_BASE               (KERNEL_BASE + 0x00c00000)
+#endif
 #define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
 
 /*