diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2007-12-02 21:28:41 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2007-12-02 21:28:41 +0000 |
| commit | 96d082fd0961b307d5402aec571fa59a275fde93 (patch) | |
| tree | ba8d346c05a83aafc6dbb14c3167ea67fdd5372a /sys/arch/m88k | |
| parent | cf67d8fb8b98c12477963015fdd28c91a18f92be (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/m88k')
| -rw-r--r-- | sys/arch/m88k/m88k/eh_common.S | 8 | ||||
| -rw-r--r-- | sys/arch/m88k/m88k/genassym.cf | 10 |
2 files changed, 6 insertions, 12 deletions
diff --git a/sys/arch/m88k/m88k/eh_common.S b/sys/arch/m88k/m88k/eh_common.S index 88dd1b194c5..468cfc1a301 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.39 2007/12/02 21:27:02 miod Exp $ */ +/* $OpenBSD: eh_common.S,v 1.40 2007/12/02 21:28:40 miod Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -938,7 +938,7 @@ ASLOCAL(m88100_use_SR3_pcb) * r30) */ ldcr r1, CPU ld r1, r1, CI_CURPCB - addu r1, r1, USIZE - SIZEOF_EF + addu r1, r1, USPACE - SIZEOF_EF st FLAGS,r1, REG_OFF(EF_FLAGS) /* store flags */ st r31, r1, GENREG_OFF(31) /* store r31 - now free */ st r30, r1, REG_OFF(EF_SR3) /* store old SR3 (pcb) */ @@ -1459,7 +1459,7 @@ ASLOCAL(m88100_fpu_enable) ldcr r31, CPU ld r31, r31, CI_CURPCB - addu r31, r31, USIZE /* point at proper end */ + addu r31, r31, USPACE /* point at proper end */ 1: /* @@ -2089,7 +2089,7 @@ ASLOCAL(m88110_shadow_enable) ldcr r31, CPU ld r31, r31, CI_CURPCB - addu r31, r31, USIZE /* point at proper end */ + addu r31, r31, USPACE /* point at proper end */ 1: /* diff --git a/sys/arch/m88k/m88k/genassym.cf b/sys/arch/m88k/m88k/genassym.cf index f57b6dd037f..8b938783a4f 100644 --- a/sys/arch/m88k/m88k/genassym.cf +++ b/sys/arch/m88k/m88k/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.14 2007/11/15 21:27:22 miod Exp $ +# $OpenBSD: genassym.cf,v 1.15 2007/12/02 21:28:40 miod Exp $ # # Copyright (c) 1982, 1990 The Regents of the University of California. # All rights reserved. @@ -28,7 +28,7 @@ # SUCH DAMAGE. # # @(#)genassym.c 7.8 (Berkeley) 5/7/91 -# $Id: genassym.cf,v 1.14 2007/11/15 21:27:22 miod Exp $ +# $Id: genassym.cf,v 1.15 2007/12/02 21:28:40 miod Exp $ # include <sys/param.h> @@ -67,12 +67,6 @@ member ci_pfsr_d1 member ci_want_resched member ci_softintr -# general constants -export UPAGES -# We export USPACE under another name to allow C code to include "assym.h". -#export USPACE -define USIZE USPACE - # pcb fields struct pcb member pcb_onfault |