summaryrefslogtreecommitdiff
path: root/sys/arch/aviion
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2007-12-02 21:28:41 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2007-12-02 21:28:41 +0000
commit96d082fd0961b307d5402aec571fa59a275fde93 (patch)
treeba8d346c05a83aafc6dbb14c3167ea67fdd5372a /sys/arch/aviion
parentcf67d8fb8b98c12477963015fdd28c91a18f92be (diff)
Do not pass UPAGES and USPACE (under the name USIZE) in assym.h, code which
needs it includes <machine/param.h> already.
Diffstat (limited to 'sys/arch/aviion')
-rw-r--r--sys/arch/aviion/aviion/locore.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/aviion/aviion/locore.S b/sys/arch/aviion/aviion/locore.S
index 69f7dbde091..ef61d321cc9 100644
--- a/sys/arch/aviion/aviion/locore.S
+++ b/sys/arch/aviion/aviion/locore.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.S,v 1.6 2007/11/15 21:23:14 miod Exp $ */
+/* $OpenBSD: locore.S,v 1.7 2007/12/02 21:28:35 miod Exp $ */
/*
* Copyright (c) 2005, Miodrag Vallat.
* Copyright (c) 1998 Steve Murphree, Jr.
@@ -244,7 +244,7 @@ ASLOCAL(main_start)
/* call main() - no arguments although main() still defines one */
bsr.n _C_LABEL(main)
- addu r31, r31, USIZE
+ addu r31, r31, USPACE
or.u r2, r0, hi16(_ASM_LABEL(main_panic))
bsr.n _C_LABEL(panic)
@@ -371,7 +371,7 @@ GLOBAL(kernel_sdt) /* SDT (segment descriptor table */
.align PAGE_SIZE
ASGLOBAL(initstack)
- space USIZE
+ space USPACE
ASGLOBAL(initstack_end)
#ifdef MULTIPROCESSOR
@@ -385,7 +385,7 @@ ASLOCAL(slavestack_end)
*/
.align PAGE_SIZE
ASLOCAL(u0)
- space USIZE
+ space USPACE
GLOBAL(proc0paddr)
word _ASM_LABEL(u0) /* KVA of proc0 uarea */