[src/trunk]: src/sys/arch Move KERNEL_VM_BASE inside where it is used (it won...

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

details:   https://anonhg.NetBSD.org/src/rev/3b202f86452a
branches:  trunk
changeset: 547526:3b202f86452a
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed May 21 22:48:20 2003 +0000

description:
Move KERNEL_VM_BASE inside where it is used (it won't be there for long).

diffstat:

 sys/arch/acorn32/acorn32/rpc_machdep.c           |  5 +++--
 sys/arch/acorn32/include/vmparam.h               |  4 +---
 sys/arch/cats/cats/cats_machdep.c                |  3 ++-
 sys/arch/cats/include/vmparam.h                  |  4 +---
 sys/arch/evbarm/adi_brh/brh_machdep.c            |  3 ++-
 sys/arch/evbarm/include/vmparam.h                |  6 +-----
 sys/arch/evbarm/integrator/integrator_machdep.c  |  3 ++-
 sys/arch/evbarm/iq80310/iq80310_machdep.c        |  3 ++-
 sys/arch/evbarm/iq80321/iq80321_machdep.c        |  3 ++-
 sys/arch/evbarm/ixm1200/ixm1200_machdep.c        |  5 +++--
 sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c      |  3 ++-
 sys/arch/hpcarm/hpcarm/hpc_machdep.c             |  3 ++-
 sys/arch/hpcarm/include/vmparam.h                |  5 +----
 sys/arch/netwinder/include/vmparam.h             |  4 +---
 sys/arch/netwinder/netwinder/netwinder_machdep.c |  4 +++-
 sys/arch/shark/include/vmparam.h                 |  5 +----
 sys/arch/shark/ofw/ofw.c                         |  4 +++-
 17 files changed, 32 insertions(+), 35 deletions(-)

diffs (truncated from 319 to 300 lines):

diff -r 09f6ebf41312 -r 3b202f86452a sys/arch/acorn32/acorn32/rpc_machdep.c
--- a/sys/arch/acorn32/acorn32/rpc_machdep.c    Wed May 21 22:28:01 2003 +0000
+++ b/sys/arch/acorn32/acorn32/rpc_machdep.c    Wed May 21 22:48:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpc_machdep.c,v 1.54 2003/05/21 17:17:50 thorpej Exp $ */
+/*     $NetBSD: rpc_machdep.c,v 1.55 2003/05/21 22:48:20 thorpej Exp $ */
 
 /*
  * Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -56,7 +56,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.54 2003/05/21 17:17:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.55 2003/05/21 22:48:20 thorpej Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -103,6 +103,7 @@
 
 /* Kernel text starts at the base of the kernel address space. */
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x00000000)
+#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
 
 /*
  * Address to call from cpu_reset() to reset the machine.
diff -r 09f6ebf41312 -r 3b202f86452a sys/arch/acorn32/include/vmparam.h
--- a/sys/arch/acorn32/include/vmparam.h        Wed May 21 22:28:01 2003 +0000
+++ b/sys/arch/acorn32/include/vmparam.h        Wed May 21 22:48:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.15 2003/05/21 17:37:57 thorpej Exp $     */
+/*     $NetBSD: vmparam.h,v 1.16 2003/05/21 22:48:21 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -50,8 +50,6 @@
  */
 #define        KERNEL_BASE             0xf0000000
 
-/* Various constants used by the MD code*/
-#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
 /*
  * The Kernel VM Size varies depending on the machine depending on how
  * much space is needed (and where) for other mappings.
diff -r 09f6ebf41312 -r 3b202f86452a sys/arch/cats/cats/cats_machdep.c
--- a/sys/arch/cats/cats/cats_machdep.c Wed May 21 22:28:01 2003 +0000
+++ b/sys/arch/cats/cats/cats_machdep.c Wed May 21 22:48:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cats_machdep.c,v 1.45 2003/05/03 18:25:30 thorpej Exp $        */
+/*     $NetBSD: cats_machdep.c,v 1.46 2003/05/21 22:48:21 thorpej Exp $        */
 
 /*
  * Copyright (c) 1997,1998 Mark Brinicombe.
@@ -85,6 +85,7 @@
 
 /* Kernel text starts at the base of the kernel address space. */
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x00000000)
+#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
 
 /*
  * Address to call from cpu_reset() to reset the machine.
diff -r 09f6ebf41312 -r 3b202f86452a sys/arch/cats/include/vmparam.h
--- a/sys/arch/cats/include/vmparam.h   Wed May 21 22:28:01 2003 +0000
+++ b/sys/arch/cats/include/vmparam.h   Wed May 21 22:48:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.20 2003/05/03 18:25:30 thorpej Exp $     */
+/*     $NetBSD: vmparam.h,v 1.21 2003/05/21 22:48:21 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -50,8 +50,6 @@
  */
 #define        KERNEL_BASE             0xf0000000
 
-/* Various constants used by the MD code*/
-#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
 /*
  * The Kernel VM Size varies depending on the machine depending on how
  * much space is needed (and where) for other mappings.
diff -r 09f6ebf41312 -r 3b202f86452a sys/arch/evbarm/adi_brh/brh_machdep.c
--- a/sys/arch/evbarm/adi_brh/brh_machdep.c     Wed May 21 22:28:01 2003 +0000
+++ b/sys/arch/evbarm/adi_brh/brh_machdep.c     Wed May 21 22:48:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: brh_machdep.c,v 1.12 2003/05/21 02:38:29 briggs Exp $  */
+/*     $NetBSD: brh_machdep.c,v 1.13 2003/05/21 22:48:21 thorpej Exp $ */
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -119,6 +119,7 @@
 
 /* Kernel text starts 2MB in from the bottom of the kernel address space. */
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x00200000)
+#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
 
 /*
  * Address to call from cpu_reset() to reset the machine.
diff -r 09f6ebf41312 -r 3b202f86452a sys/arch/evbarm/include/vmparam.h
--- a/sys/arch/evbarm/include/vmparam.h Wed May 21 22:28:01 2003 +0000
+++ b/sys/arch/evbarm/include/vmparam.h Wed May 21 22:48:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.18 2003/05/03 18:25:31 thorpej Exp $     */
+/*     $NetBSD: vmparam.h,v 1.19 2003/05/21 22:48:21 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -50,10 +50,6 @@
  */
 #define        KERNEL_BASE             0xc0000000
 
-#ifndef ARM32_NEW_VM_LAYOUT
-/* Various constants used by the MD code*/
-#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
-#endif
 /*
  * The Kernel VM Size varies depending on the machine depending on how
  * much space is needed (and where) for other mappings.
diff -r 09f6ebf41312 -r 3b202f86452a sys/arch/evbarm/integrator/integrator_machdep.c
--- a/sys/arch/evbarm/integrator/integrator_machdep.c   Wed May 21 22:28:01 2003 +0000
+++ b/sys/arch/evbarm/integrator/integrator_machdep.c   Wed May 21 22:48:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: integrator_machdep.c,v 1.38 2003/05/17 23:47:00 thorpej Exp $  */
+/*     $NetBSD: integrator_machdep.c,v 1.39 2003/05/21 22:48:22 thorpej Exp $  */
 
 /*
  * Copyright (c) 2001,2002 ARM Ltd
@@ -109,6 +109,7 @@
 
 /* Kernel text starts 2MB in from the bottom of the kernel address space. */
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x00200000)
+#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
 
 /*
  * Address to call from cpu_reset() to reset the machine.
diff -r 09f6ebf41312 -r 3b202f86452a sys/arch/evbarm/iq80310/iq80310_machdep.c
--- a/sys/arch/evbarm/iq80310/iq80310_machdep.c Wed May 21 22:28:01 2003 +0000
+++ b/sys/arch/evbarm/iq80310/iq80310_machdep.c Wed May 21 22:48:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iq80310_machdep.c,v 1.55 2003/05/17 23:47:00 thorpej Exp $     */
+/*     $NetBSD: iq80310_machdep.c,v 1.56 2003/05/21 22:48:22 thorpej Exp $     */
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -116,6 +116,7 @@
 
 /* Kernel text starts 2MB in from the bottom of the kernel address space. */
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x00200000)
+#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
 
 /*
  * Address to call from cpu_reset() to reset the machine.
diff -r 09f6ebf41312 -r 3b202f86452a sys/arch/evbarm/iq80321/iq80321_machdep.c
--- a/sys/arch/evbarm/iq80321/iq80321_machdep.c Wed May 21 22:28:01 2003 +0000
+++ b/sys/arch/evbarm/iq80321/iq80321_machdep.c Wed May 21 22:48:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iq80321_machdep.c,v 1.24 2003/05/17 23:47:01 thorpej Exp $     */
+/*     $NetBSD: iq80321_machdep.c,v 1.25 2003/05/21 22:48:22 thorpej Exp $     */
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -117,6 +117,7 @@
 
 /* Kernel text starts 2MB in from the bottom of the kernel address space. */
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x00200000)
+#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
 
 /*
  * Address to call from cpu_reset() to reset the machine.
diff -r 09f6ebf41312 -r 3b202f86452a sys/arch/evbarm/ixm1200/ixm1200_machdep.c
--- a/sys/arch/evbarm/ixm1200/ixm1200_machdep.c Wed May 21 22:28:01 2003 +0000
+++ b/sys/arch/evbarm/ixm1200/ixm1200_machdep.c Wed May 21 22:48:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixm1200_machdep.c,v 1.23 2003/05/17 23:47:01 thorpej Exp $ */
+/*     $NetBSD: ixm1200_machdep.c,v 1.24 2003/05/21 22:48:23 thorpej Exp $ */
 
 /*
  * Copyright (c) 2002, 2003
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.23 2003/05/17 23:47:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.24 2003/05/21 22:48:23 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
@@ -126,6 +126,7 @@
 
 /* Kernel text starts 2MB in from the bottom of the kernel address space. */
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x00200000)
+#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
 
 /*
  * Address to call from cpu_reset() to reset the machine.
diff -r 09f6ebf41312 -r 3b202f86452a sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
--- a/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c       Wed May 21 22:28:01 2003 +0000
+++ b/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c       Wed May 21 22:48:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smdk2800_machdep.c,v 1.10 2003/05/17 23:47:01 thorpej Exp $ */
+/*     $NetBSD: smdk2800_machdep.c,v 1.11 2003/05/21 22:48:23 thorpej Exp $ */
 
 /*
  * Copyright (c) 2002 Fujitsu Component Limited
@@ -164,6 +164,7 @@
 
 /* Kernel text starts 2MB in from the bottom of the kernel address space. */
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x00200000)
+#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
 
 /* Memory disk support */
 #if defined(MEMORY_DISK_DYNAMIC) && defined(MEMORY_DISK_ROOT_ADDR)
diff -r 09f6ebf41312 -r 3b202f86452a sys/arch/hpcarm/hpcarm/hpc_machdep.c
--- a/sys/arch/hpcarm/hpcarm/hpc_machdep.c      Wed May 21 22:28:01 2003 +0000
+++ b/sys/arch/hpcarm/hpcarm/hpc_machdep.c      Wed May 21 22:48:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hpc_machdep.c,v 1.66 2003/05/03 18:25:34 thorpej Exp $ */
+/*     $NetBSD: hpc_machdep.c,v 1.67 2003/05/21 22:48:23 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -110,6 +110,7 @@
 
 /* Kernel text starts 256K in from the bottom of the kernel address space. */
 #define        KERNEL_TEXT_BASE        (KERNEL_BASE + 0x00040000)
+#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x00c00000)
 
 /*
  * Address to call from cpu_reset() to reset the machine.
diff -r 09f6ebf41312 -r 3b202f86452a sys/arch/hpcarm/include/vmparam.h
--- a/sys/arch/hpcarm/include/vmparam.h Wed May 21 22:28:01 2003 +0000
+++ b/sys/arch/hpcarm/include/vmparam.h Wed May 21 22:48:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.22 2003/05/03 18:25:35 thorpej Exp $     */
+/*     $NetBSD: vmparam.h,v 1.23 2003/05/21 22:48:23 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -50,9 +50,6 @@
  */
 #define        KERNEL_BASE             0xc0000000
 
-/* Various constants used by the MD code*/
-#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x00c00000)
-
 /*
  * The Kernel VM Size varies depending on the machine depending on how
  * much space is needed (and where) for other mappings.
diff -r 09f6ebf41312 -r 3b202f86452a sys/arch/netwinder/include/vmparam.h
--- a/sys/arch/netwinder/include/vmparam.h      Wed May 21 22:28:01 2003 +0000
+++ b/sys/arch/netwinder/include/vmparam.h      Wed May 21 22:48:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.18 2003/05/03 18:25:35 thorpej Exp $     */
+/*     $NetBSD: vmparam.h,v 1.19 2003/05/21 22:48:23 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -50,8 +50,6 @@
  */
 #define        KERNEL_BASE             0xf0000000
 
-/* Various constants used by the MD code*/
-#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
 /*
  * The Kernel VM Size varies depending on the machine depending on how
  * much space is needed (and where) for other mappings.
diff -r 09f6ebf41312 -r 3b202f86452a sys/arch/netwinder/netwinder/netwinder_machdep.c
--- a/sys/arch/netwinder/netwinder/netwinder_machdep.c  Wed May 21 22:28:01 2003 +0000
+++ b/sys/arch/netwinder/netwinder/netwinder_machdep.c  Wed May 21 22:48:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netwinder_machdep.c,v 1.49 2003/05/03 03:49:07 thorpej Exp $   */
+/*     $NetBSD: netwinder_machdep.c,v 1.50 2003/05/21 22:48:24 thorpej Exp $   */
 
 /*
  * Copyright (c) 1997,1998 Mark Brinicombe.
@@ -157,6 +157,8 @@
 
 pv_addr_t kernel_pt_table[NUM_KERNEL_PTS];
 
+#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
+
 struct user *proc0paddr;
 
 /* Prototypes */
diff -r 09f6ebf41312 -r 3b202f86452a sys/arch/shark/include/vmparam.h
--- a/sys/arch/shark/include/vmparam.h  Wed May 21 22:28:01 2003 +0000
+++ b/sys/arch/shark/include/vmparam.h  Wed May 21 22:48:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.10 2003/05/03 18:25:35 thorpej Exp $     */
+/*     $NetBSD: vmparam.h,v 1.11 2003/05/21 22:48:24 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -50,9 +50,6 @@
  */
 #define        KERNEL_BASE             0xf0000000
 
-/* Various constants used by the MD code */
-#define        KERNEL_VM_BASE          (KERNEL_BASE + 0x01000000)
-
 /*
  * The range 0xf1000000 - 0xf6ffffff is available for kernel VM space