intstack does not need to be visible from C code anymore.

3 files changed, 21 insertions, 21 deletions

diff --git a/sys/arch/luna88k/luna88k/locore.S b/sys/arch/luna88k/luna88k/locore.S
index 73bb31395ed..4b4cf2a2dfd 100644
--- a/sys/arch/luna88k/luna88k/locore.S
+++ b/sys/arch/luna88k/luna88k/locore.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.S,v 1.10 2005/12/03 14:30:05 miod Exp $	*/
+/*	$OpenBSD: locore.S,v 1.11 2005/12/03 18:20:48 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -398,16 +398,16 @@ GLOBAL(delay)
 /*****************************************************************************/
 
 	data
-	.align NBPG
+	.align	PAGE_SIZE
 GLOBAL(kernel_sdt)		/* SDT (segment descriptor table */
 	space	0x2000		/* 8K - 4K phys, 4K virt*/
 
-	.align NBPG
-GLOBAL(intstack)
+	.align	PAGE_SIZE
+ASGLOBAL(intstack)
 	space	USIZE
 ASGLOBAL(intstack_end)
 ASGLOBAL(slavestack)
-	space	NBPG		/* 4K, small, interim stack */
+	space	PAGE_SIZE	/* 4K, small, interim stack */
 ASGLOBAL(slavestack_end)
 
 /*
@@ -419,7 +419,7 @@ ASGLOBAL(slavestack_end)
  * we feel like doing that).
  * Should be page aligned.
  */
-	.align NBPG
+	.align	PAGE_SIZE
 GLOBAL(idle_u)
 	space	USIZE
 
@@ -428,9 +428,9 @@ GLOBAL(idle_u)
  *
  * This must be page aligned
  */
-	.align	NBPG
+	.align	PAGE_SIZE
 ASLOCAL(u0)
-	space	UPAGES * NBPG
+	space	USIZE
 GLOBAL(proc0paddr)
 	word	_ASM_LABEL(u0)	/*  KVA of proc0 uarea */
 
diff --git a/sys/arch/m88k/m88k/eh_common.S b/sys/arch/m88k/m88k/eh_common.S
index df15ba03372..ab1290617ad 100644
--- a/sys/arch/m88k/m88k/eh_common.S
+++ b/sys/arch/m88k/m88k/eh_common.S
@@ -1,4 +1,4 @@
-/*   $OpenBSD: eh_common.S,v 1.14 2005/12/03 14:30:06 miod Exp $	*/
+/*   $OpenBSD: eh_common.S,v 1.15 2005/12/03 18:20:50 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -612,8 +612,8 @@ GLOBAL(reset_handler)
 
 #ifdef DEBUG
 	/* zero the stack, so we'll know what we're lookin' at */
-	or.u	r27, r0,  hi16(_C_LABEL(intstack))
-	or	r27, r27, lo16(_C_LABEL(intstack))
+	or.u	r27, r0,  hi16(_ASM_LABEL(intstack))
+	or	r27, r27, lo16(_ASM_LABEL(intstack))
 1:	cmp	r28, r27, r31
 	bb1	ge,  r28, 2f	/* branch if at the end of the stack */
 	st	r0,  r0,  r27
@@ -2020,8 +2020,8 @@ GLOBAL(m88110_reset_handler)
 
 #ifdef DEBUG
 	/* zero the stack, so we'll know what we're lookin' at */
-	or.u	r27, r0,  hi16(_C_LABEL(intstack))
-	or	r27, r27, lo16(_C_LABEL(intstack))
+	or.u	r27, r0,  hi16(_ASM_LABEL(intstack))
+	or	r27, r27, lo16(_ASM_LABEL(intstack))
 1:	cmp	r28, r27, r31
 	bb1	ge,  r28, 2f	/* branch if at the end of the stack */
 	st	r0,  r0,  r27
diff --git a/sys/arch/mvme88k/mvme88k/locore.S b/sys/arch/mvme88k/mvme88k/locore.S
index 3fc6f43e4f2..6fabd59e1c2 100644
--- a/sys/arch/mvme88k/mvme88k/locore.S
+++ b/sys/arch/mvme88k/mvme88k/locore.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.S,v 1.44 2005/12/03 14:30:06 miod Exp $	*/
+/*	$OpenBSD: locore.S,v 1.45 2005/12/03 18:20:51 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -433,16 +433,16 @@ GLOBAL(m188_delay)
 /*****************************************************************************/
 
 	data
-	.align NBPG
+	.align	PAGE_SIZE
 GLOBAL(kernel_sdt)		/* SDT (segment descriptor table */
 	space	0x2000		/* 8K - 4K phys, 4K virt*/
 
-	.align NBPG
-GLOBAL(intstack)
+	.align	PAGE_SIZE
+ASGLOBAL(intstack)
 	space	USIZE
 ASGLOBAL(intstack_end)
 ASGLOBAL(slavestack)
-	space	NBPG		/* 4K, small, interim stack */
+	space	PAGE_SIZE	/* 4K, small, interim stack */
 ASGLOBAL(slavestack_end)
 
 /*
@@ -454,7 +454,7 @@ ASGLOBAL(slavestack_end)
  * we feel like doing that).
  * Should be page aligned.
  */
-	.align NBPG
+	.align	PAGE_SIZE
 GLOBAL(idle_u)
 	space	USIZE
 
@@ -463,9 +463,9 @@ GLOBAL(idle_u)
  *
  * This must be page aligned
  */
-	.align	NBPG
+	.align	PAGE_SIZE
 ASLOCAL(u0)
-	space	UPAGES * NBPG
+	space	USIZE
 GLOBAL(proc0paddr)
 	word	_ASM_LABEL(u0)	/*  KVA of proc0 uarea */