From f051bae440ec0fa5fe664e635090e32f92a54cdc Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Sun, 17 Apr 2005 18:47:52 +0000
Subject: Do not use KERNBASE when VM_MIN_KERNEL_ADDRESS or VM_MAXUSER_ADDRESS
 are implied; this currently does not change anything (yet).

Also, define the I/O space range in <machine/vmparam.h> rather than in
<sparc/sparc/vaddrs.h>.

ok deraadt@ mickey@
---
 sys/arch/sparc/include/pmap.h    |  6 +++---
 sys/arch/sparc/include/vmparam.h | 11 +++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'sys/arch/sparc/include')

diff --git a/sys/arch/sparc/include/pmap.h b/sys/arch/sparc/include/pmap.h
index b754e9ab4e2..b6586168a1c 100644
--- a/sys/arch/sparc/include/pmap.h
+++ b/sys/arch/sparc/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.39 2005/04/04 23:40:02 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.40 2005/04/17 18:47:48 miod Exp $	*/
 /*	$NetBSD: pmap.h,v 1.30 1997/08/04 20:00:47 pk Exp $ */
 
 /*
@@ -124,8 +124,8 @@
  * pointers to each other. These must (unfortunately) be kept in sync.
  *
  */
-#define NKREG	((int)((-(unsigned)KERNBASE) / NBPRG))	/* i.e., 8 */
-#define NUREG	(256 - NKREG)				/* i.e., 248 */
+#define NKREG	((int)((-(unsigned)VM_MIN_KERNEL_ADDRESS) / NBPRG))	/* 8 */
+#define NUREG	(256 - NKREG)					      /* 248 */
 
 TAILQ_HEAD(mmuhd,mmuentry);
 
diff --git a/sys/arch/sparc/include/vmparam.h b/sys/arch/sparc/include/vmparam.h
index dc35ede11e3..8557ec3fb71 100644
--- a/sys/arch/sparc/include/vmparam.h
+++ b/sys/arch/sparc/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.30 2005/04/11 15:13:01 deraadt Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.31 2005/04/17 18:47:48 miod Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.13 1997/07/12 16:20:03 perry Exp $	*/
 
 /*
@@ -53,7 +53,7 @@
  * is the top (end) of the user stack.
  */
 #define	USRTEXT		0x2000			/* Start of user text */
-#define	USRSTACK	KERNBASE		/* Start of user stack */
+#define	USRSTACK	VM_MIN_KERNEL_ADDRESS	/* Start of user stack */
 
 /*
  * Virtual memory related constants, all in bytes
@@ -90,11 +90,14 @@
  * tread with care.
  */
 #define VM_MIN_ADDRESS		((vaddr_t)0)
-#define VM_MAX_ADDRESS		((vaddr_t)KERNBASE)
-#define VM_MAXUSER_ADDRESS	((vaddr_t)KERNBASE)
+#define VM_MAX_ADDRESS		((vaddr_t)VM_MIN_KERNEL_ADDRESS)
+#define VM_MAXUSER_ADDRESS	((vaddr_t)VM_MIN_KERNEL_ADDRESS)
 #define VM_MIN_KERNEL_ADDRESS	((vaddr_t)KERNBASE)
 #define VM_MAX_KERNEL_ADDRESS	((vaddr_t)0xfe000000)
 
+#define	IOSPACE_BASE		VM_MAX_KERNEL_ADDRESS
+#define	IOSPACE_LEN		0x01000000		/* 16 MB of iospace */
+
 #define VM_PHYSSEG_MAX		32	/* we only have one "hole" */
 #define VM_PHYSSEG_STRAT	VM_PSTRAT_BSEARCH
 #define VM_PHYSSEG_NOADD		/* can't add RAM after vm_mem_init */
-- 
cgit v1.2.3