Drop the workarounds allowing SMALL_KERNEL (i.e. installation media) to be

booted from old (< 2.10) bootblocks.

4 files changed, 7 insertions, 35 deletions

diff --git a/sys/arch/sparc/include/vmparam.h b/sys/arch/sparc/include/vmparam.h
index 77d0deb2407..8966335cca3 100644
--- a/sys/arch/sparc/include/vmparam.h
+++ b/sys/arch/sparc/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.46 2015/06/02 04:31:53 miod Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.47 2015/09/18 12:50:27 miod Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.13 1997/07/12 16:20:03 perry Exp $	*/
 
 /*
@@ -90,13 +90,7 @@
 #define	VM_MIN_KERNEL_ADDRESS_SUN4	((vaddr_t)0xf0000000)
 #define	VM_MIN_KERNEL_ADDRESS_SRMMU	((vaddr_t)0xc0000000)
 
-#if defined(SMALL_KERNEL)
-/* limit to small KVA regardless of the cpu type */
-#define	VM_MIN_KERNEL_ADDRESS	VM_MIN_KERNEL_ADDRESS_OLD
-#define VM_MAXUSER_ADDRESS	VM_MIN_KERNEL_ADDRESS
-#define VM_MAX_ADDRESS		VM_MIN_KERNEL_ADDRESS
-#define	USRSTACK		VM_MIN_KERNEL_ADDRESS
-#elif (defined(SUN4) || defined(SUN4C) || defined(SUN4E)) && \
+#if (defined(SUN4) || defined(SUN4C) || defined(SUN4E)) && \
       (defined(SUN4D) || defined(SUN4M))
 /* user/kernel bound will de determined at run time */
 extern vsize_t vm_kernel_space_size;
diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c
index a89f223e79c..4022587a28d 100644
--- a/sys/arch/sparc/sparc/autoconf.c
+++ b/sys/arch/sparc/sparc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.100 2015/03/30 20:30:22 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.101 2015/09/18 12:50:28 miod Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */
 
 /*
@@ -160,7 +160,7 @@ struct om_vector *oldpvec = (struct om_vector *)PROM_BASE;
 #endif
 
 #if (defined(SUN4) || defined(SUN4C) || defined(SUN4E)) && \
-    (defined(SUN4D) || defined(SUN4M)) && !defined(SMALL_KERNEL)
+    (defined(SUN4D) || defined(SUN4M))
 vaddr_t vm_kernel_space_size;
 #endif
 
@@ -249,7 +249,7 @@ bootstrap()
 	 * both the old Sun MMU and the SRMMU).
 	 */
 #if (defined(SUN4) || defined(SUN4C) || defined(SUN4E)) && \
-    (defined(SUN4D) || defined(SUN4M)) && !defined(SMALL_KERNEL)
+    (defined(SUN4D) || defined(SUN4M))
 	if (CPU_ISSUN4OR4COR4E)
 		vm_min_kernel_address = VM_MIN_KERNEL_ADDRESS_SUN4;
 	else
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index ae26a175dcf..ab4458f75dc 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.173 2015/09/08 10:21:16 deraadt Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.174 2015/09/18 12:50:28 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */
 
 /*
@@ -171,7 +171,6 @@ cpu_startup()
 	printf("real mem = %lu (%luMB)\n", ptoa(physmem),
 	    ptoa(physmem)/1024/1024);
 
-#if !defined(SMALL_KERNEL)
 	/*
 	 * uvm_km_init() has allocated all the virtual memory below the
 	 * end of the kernel image. If VM_MIN_KERNEL_ADDRESS is below
@@ -180,7 +179,6 @@ cpu_startup()
 	if (vm_min_kernel_address < (vaddr_t)KERNBASE) {
 		uvm_unmap(kernel_map, vm_min_kernel_address, (vaddr_t)KERNBASE);
 	}
-#endif
 
 	/*
 	 * Allocate a submap for exec arguments.  This map effectively
diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c
index b8c94f4d1ff..d45d8e76f70 100644
--- a/sys/arch/sparc/sparc/pmap.c
+++ b/sys/arch/sparc/sparc/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.177 2015/03/27 20:25:39 miod Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.178 2015/09/18 12:50:28 miod Exp $	*/
 /*	$NetBSD: pmap.c,v 1.118 1998/05/19 19:00:18 thorpej Exp $ */
 
 /*
@@ -82,26 +82,6 @@
 #include <sparc/sparc/vaddrs.h>
 #include <sparc/sparc/cpuvar.h>
 
-#ifdef SMALL_KERNEL
-/*
- * Force the SRMMU code to be limited to the Sun-4 compatible VM layout.
- * (this is done here to allow installation kernels to be loaded by older
- *  boot blocks which do not map enough data after the kernel image to
- *  cover pmap_bootstrap() needs.)
- */
-#define	NKREG_OLD \
-	((unsigned int)(-VM_MIN_KERNEL_ADDRESS_OLD / NBPRG))	/* 8 */
-#define	NUREG_OLD	(256 - NKREG_OLD)			/* 248 */
-#undef	NKREG_4C
-#undef	NUREG_4C
-#undef	NKREG_4M
-#undef	NUREG_4M
-#define	NKREG_4C	NKREG_OLD
-#define	NUREG_4C	NUREG_OLD
-#define	NKREG_4M	NKREG_OLD
-#define	NUREG_4M	NUREG_OLD
-#endif
-
 #ifdef DEBUG
 #define PTE_BITS "\20\40V\37W\36S\35NC\33IO\32U\31M"
 #define PTE_BITS4M "\20\10C\7M\6R\5ACC3\4ACC2\3ACC1\2TYP2\1TYP1"