[src/trunk]: src/sys/arch/arm/include/arm32 VM_{MIN, MAX}* are now the same fo...

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

details:   https://anonhg.NetBSD.org/src/rev/a366b6a3a351
branches:  trunk
changeset: 546687:a366b6a3a351
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun May 04 01:54:32 2003 +0000

description:
VM_{MIN,MAX}* are now the same for ARM32_PMAP_NEW with both new and
old VM layout, so merge the two cases.

diffstat:

 sys/arch/arm/include/arm32/vmparam.h |  16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)

diffs (44 lines):

diff -r db74b6e6676e -r a366b6a3a351 sys/arch/arm/include/arm32/vmparam.h
--- a/sys/arch/arm/include/arm32/vmparam.h      Sun May 04 01:54:26 2003 +0000
+++ b/sys/arch/arm/include/arm32/vmparam.h      Sun May 04 01:54:32 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.16 2003/05/03 18:25:29 thorpej Exp $     */
+/*     $NetBSD: vmparam.h,v 1.17 2003/05/04 01:54:32 thorpej Exp $     */
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -82,7 +82,6 @@
 #define        PAGE_SIZE       (1 << PAGE_SHIFT)
 #define        PAGE_MASK       (PAGE_SIZE - 1)
 
-#ifndef ARM32_NEW_VM_LAYOUT
 #ifdef ARM32_PMAP_NEW
 /*
  * Mach derived constants
@@ -90,6 +89,7 @@
 #define        VM_MIN_ADDRESS          ((vaddr_t) 0x00001000)
 #define        VM_MAXUSER_ADDRESS      ((vaddr_t) KERNEL_BASE)
 #define        VM_MAX_ADDRESS          VM_MAXUSER_ADDRESS
+
 #define        VM_MIN_KERNEL_ADDRESS   ((vaddr_t) KERNEL_BASE)
 #define        VM_MAX_KERNEL_ADDRESS   ((vaddr_t) 0xffffffff)
 #else /* ! ARM32_PMAP_NEW */
@@ -114,18 +114,6 @@
 #define        VM_MAX_KERNEL_ADDRESS   ((vaddr_t) 0xffffffff)
 #endif /* ARM32_PMAP_NEW */
 
-#else /* ARM32_NEW_VM_LAYOUT */
-/*
- * New VM layout
- */
-#define        VM_MIN_ADDRESS          ((vaddr_t) 0x00001000)
-#define        VM_MAXUSER_ADDRESS      ((vaddr_t) KERNEL_BASE)
-#define        VM_MAX_ADDRESS          VM_MAXUSER_ADDRESS
-
-#define        VM_MIN_KERNEL_ADDRESS   ((vaddr_t) KERNEL_BASE)
-#define        VM_MAX_KERNEL_ADDRESS   ((vaddr_t) 0xffffffff)
-#endif /* ARM32_NEW_VM_LAYOUT */
-
 /*
  * pmap-specific data store in the vm_page structure.
  */