Do not use USRSTACK when VM_MIN_KERNEL_ADDRESS is what you really mean.

6 files changed, 10 insertions, 12 deletions

diff --git a/sys/arch/solbourne/solbourne/genassym.cf b/sys/arch/solbourne/solbourne/genassym.cf
index 5cb3b542655..be35c2e61b8 100644
--- a/sys/arch/solbourne/solbourne/genassym.cf
+++ b/sys/arch/solbourne/solbourne/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.2 2009/04/10 20:57:28 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.3 2015/02/09 09:21:30 miod Exp $
 #
 # Copyright (c) 2005, Miodrag Vallat
 #
@@ -54,7 +54,6 @@ member	REGS		sp_regs
 # Sparc general constants and structures
 #
 
-export	USRSTACK
 export	VM_MIN_KERNEL_ADDRESS
 
 export	SYS_exit
diff --git a/sys/arch/solbourne/solbourne/locore.s b/sys/arch/solbourne/solbourne/locore.s
index 1051aeb37e7..2272aac7db3 100644
--- a/sys/arch/solbourne/solbourne/locore.s
+++ b/sys/arch/solbourne/solbourne/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.18 2013/06/13 15:34:04 deraadt Exp $	*/
+/*	$OpenBSD: locore.s,v 1.19 2015/02/09 09:21:30 miod Exp $	*/
 /*	OpenBSD: locore.s,v 1.64 2005/04/17 18:47:50 miod Exp 	*/
 
 /*
@@ -2620,7 +2620,7 @@ dostart:
 	sethi	%hi(_C_LABEL(u0) + PCB_WIM), %g2
 	st	%g1, [%g2 + %lo(_C_LABEL(u0) + PCB_WIM)]
 
-	set	USRSTACK - CCFSZ, %fp	! as if called from user code
+	set	VM_MIN_KERNEL_ADDRESS - CCFSZ, %fp	! as if called from user code
 	set	estack0 - CCFSZ - 80, %sp ! via syscall(boot_me_up) or somesuch
 	rd	%psr, %l0
 	wr	%l0, PSR_ET, %psr
diff --git a/sys/arch/sparc/sparc/db_trace.c b/sys/arch/sparc/sparc/db_trace.c
index 5af447e60b2..ec3de4dba46 100644
--- a/sys/arch/sparc/sparc/db_trace.c
+++ b/sys/arch/sparc/sparc/db_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trace.c,v 1.6 2002/05/18 09:49:17 art Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.7 2015/02/09 09:21:30 miod Exp $	*/
 /*	$NetBSD: db_trace.c,v 1.9 1997/07/29 09:42:00 fair Exp $ */
 
 /*
@@ -36,7 +36,7 @@
 #include <ddb/db_interface.h>
 #include <ddb/db_output.h>
 
-#define INKERNEL(va)	(((vaddr_t)(va)) >= USRSTACK)
+#define INKERNEL(va)	(((vaddr_t)(va)) >= VM_MIN_KERNEL_ADDRESS)
 
 void
 db_stack_trace_print(addr, have_addr, count, modif, pr)
diff --git a/sys/arch/sparc/sparc/genassym.cf b/sys/arch/sparc/sparc/genassym.cf
index 7b93e95bfc9..273be0cd646 100644
--- a/sys/arch/sparc/sparc/genassym.cf
+++ b/sys/arch/sparc/sparc/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.23 2011/09/03 20:04:04 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.24 2015/02/09 09:21:30 miod Exp $
 #	$NetBSD: genassym.cf,v 1.2 1997/06/28 19:59:04 pk Exp $
 
 #
@@ -72,7 +72,6 @@ include <sparc/dev/fdvar.h>
 # general constants
 export	SUN4_PGSHIFT
 export	SUN4CM_PGSHIFT
-export	USRSTACK
 export	IOSPACE_BASE
 export	VM_MIN_KERNEL_ADDRESS
 
diff --git a/sys/arch/sparc/sparc/locore.s b/sys/arch/sparc/sparc/locore.s
index 516d091d334..a57e4ca9764 100644
--- a/sys/arch/sparc/sparc/locore.s
+++ b/sys/arch/sparc/sparc/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.96 2014/11/22 22:49:44 miod Exp $	*/
+/*	$OpenBSD: locore.s,v 1.97 2015/02/09 09:21:30 miod Exp $	*/
 /*	$NetBSD: locore.s,v 1.73 1997/09/13 20:36:48 pk Exp $	*/
 
 /*
@@ -3765,7 +3765,7 @@ startmap_done:
 	sethi	%hi(_C_LABEL(u0) + PCB_WIM), %g2
 	st	%g1, [%g2 + %lo(_C_LABEL(u0) + PCB_WIM)]
 
-	set	USRSTACK - CCFSZ, %fp	! as if called from user code
+	set	VM_MIN_KERNEL_ADDRESS - CCFSZ, %fp	! as if called from user code
 	set	estack0 - CCFSZ - 80, %sp ! via syscall(boot_me_up) or somesuch
 	rd	%psr, %l0
 	wr	%l0, PSR_ET, %psr
diff --git a/sys/arch/sparc64/sparc64/db_trace.c b/sys/arch/sparc64/sparc64/db_trace.c
index 6270df756a4..756da59c061 100644
--- a/sys/arch/sparc64/sparc64/db_trace.c
+++ b/sys/arch/sparc64/sparc64/db_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trace.c,v 1.9 2007/08/15 20:10:08 kettenis Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.10 2015/02/09 09:21:30 miod Exp $	*/
 /*	$NetBSD: db_trace.c,v 1.23 2001/07/10 06:06:16 eeh Exp $ */
 
 /*
@@ -47,7 +47,7 @@ void db_dump_ts(db_expr_t, int, db_expr_t, char *);
 void db_print_window(u_int64_t);
 
 #if 0
-#define INKERNEL(va)	(((vaddr_t)(va)) >= USRSTACK) /* Not really true, y'know */
+#define INKERNEL(va)	(((vaddr_t)(va)) >= VM_MIN_KERNEL_ADDRESS) /* Not really true, y'know */
 #else
 #define INKERNEL(va)	1	/* Everything's in the kernel now. 8^) */
 #endif