summaryrefslogtreecommitdiff
path: root/sys/arch/sparc/include
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2015-03-27 20:25:40 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2015-03-27 20:25:40 +0000
commitbb799bdf7d658e836cca5fc08a1eb0752d63a706 (patch)
tree893b856e916f99bda9cae40e941eef640e9f73ce /sys/arch/sparc/include
parent09bd204bd0caca79d1f69539f9f6488666442407 (diff)
Lower VM_MIN_KERNEL_ADDRESS by 128MB on non-SRMMU systems (sun4/4c/4e) as well,
in order to give these systems a more reasonable amount of kva, yet still providing .75GB to userland processes. Although there is no dependency upon a recent boot loader on non-SRMMU systems, SMALL_KERNEL will nevertheless stick to the legacy kvm layout, for the time being.
Diffstat (limited to 'sys/arch/sparc/include')
-rw-r--r--sys/arch/sparc/include/pmap.h6
-rw-r--r--sys/arch/sparc/include/vmparam.h5
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/arch/sparc/include/pmap.h b/sys/arch/sparc/include/pmap.h
index e774a05dfb4..03881858700 100644
--- a/sys/arch/sparc/include/pmap.h
+++ b/sys/arch/sparc/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.58 2015/03/18 20:56:40 miod Exp $ */
+/* $OpenBSD: pmap.h,v 1.59 2015/03/27 20:25:39 miod Exp $ */
/* $NetBSD: pmap.h,v 1.30 1997/08/04 20:00:47 pk Exp $ */
/*
@@ -132,8 +132,8 @@
*
*/
#define NKREG_4C \
- ((unsigned int)(-VM_MIN_KERNEL_ADDRESS_OLD / NBPRG)) /* 8 */
-#define NUREG_4C (256 - NKREG_4C) /* 248 */
+ ((unsigned int)(-VM_MIN_KERNEL_ADDRESS_SUN4 / NBPRG)) /* 16 */
+#define NUREG_4C (256 - NKREG_4C) /* 240 */
#define NKREG_4M \
((unsigned int)(-VM_MIN_KERNEL_ADDRESS_SRMMU / NBPRG)) /* 64 */
#define NUREG_4M (256 - NKREG_4M) /* 192 */
diff --git a/sys/arch/sparc/include/vmparam.h b/sys/arch/sparc/include/vmparam.h
index 5e678c920e6..b7356412985 100644
--- a/sys/arch/sparc/include/vmparam.h
+++ b/sys/arch/sparc/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.43 2015/03/18 20:56:40 miod Exp $ */
+/* $OpenBSD: vmparam.h,v 1.44 2015/03/27 20:25:39 miod Exp $ */
/* $NetBSD: vmparam.h,v 1.13 1997/07/12 16:20:03 perry Exp $ */
/*
@@ -87,6 +87,7 @@
*/
#define VM_MIN_KERNEL_ADDRESS_OLD ((vaddr_t)KERNBASE)
+#define VM_MIN_KERNEL_ADDRESS_SUN4 ((vaddr_t)0xf0000000)
#define VM_MIN_KERNEL_ADDRESS_SRMMU ((vaddr_t)0xc0000000)
#if defined(SMALL_KERNEL)
@@ -105,7 +106,7 @@ extern vsize_t vm_kernel_space_size;
#define USRSTACK vm_min_kernel_address
#elif (defined(SUN4) || defined(SUN4C) || defined(SUN4E))
/* old Sun MMU with address hole */
-#define VM_MIN_KERNEL_ADDRESS VM_MIN_KERNEL_ADDRESS_OLD
+#define VM_MIN_KERNEL_ADDRESS VM_MIN_KERNEL_ADDRESS_SUN4
#define VM_MAXUSER_ADDRESS VM_MIN_KERNEL_ADDRESS
#define VM_MAX_ADDRESS VM_MIN_KERNEL_ADDRESS
#define USRSTACK VM_MIN_KERNEL_ADDRESS