diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2003-08-10 21:34:21 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2003-08-10 21:34:21 +0000 |
| commit | 9d31d2fcaf1a2f78760a7644406ca8facd2b20f5 (patch) | |
| tree | 5049bd528ed83bab4368b35e54ca1b1fb672da5e /sys/arch/mvme88k | |
| parent | 5eb11a7915208c383a6daeccb907fddee5508bff (diff) | |
Do not make NBPG visible in assym.h
Diffstat (limited to 'sys/arch/mvme88k')
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/genassym.cf | 6 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/locore_c_routines.c | 3 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/process.S | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/sys/arch/mvme88k/mvme88k/genassym.cf b/sys/arch/mvme88k/mvme88k/genassym.cf index 29b9d35a4ee..4334bc5a239 100644 --- a/sys/arch/mvme88k/mvme88k/genassym.cf +++ b/sys/arch/mvme88k/mvme88k/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.6 2003/06/02 23:27:52 millert Exp $ +# $OpenBSD: genassym.cf,v 1.7 2003/08/10 21:34:20 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.6 2003/06/02 23:27:52 millert Exp $ +# $Id: genassym.cf,v 1.7 2003/08/10 21:34:20 miod Exp $ # include <sys/param.h> @@ -57,7 +57,6 @@ export SRUN # general constants export UPAGES define USIZE USPACE -export NBPG # pcb fields struct pcb @@ -143,4 +142,3 @@ member pcb_r28 member pcb_r29 member pcb_r30 member pcb_sp - diff --git a/sys/arch/mvme88k/mvme88k/locore_c_routines.c b/sys/arch/mvme88k/mvme88k/locore_c_routines.c index 6dfec40381e..d89fb45d25e 100644 --- a/sys/arch/mvme88k/mvme88k/locore_c_routines.c +++ b/sys/arch/mvme88k/mvme88k/locore_c_routines.c @@ -1,4 +1,4 @@ -/* $OpenBSD: locore_c_routines.c,v 1.28 2003/08/01 07:47:58 miod Exp $ */ +/* $OpenBSD: locore_c_routines.c,v 1.29 2003/08/10 21:34:20 miod Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -27,7 +27,6 @@ */ #include "assym.h" -#undef NBPG /* gasp */ #include <sys/param.h> #include <sys/types.h> diff --git a/sys/arch/mvme88k/mvme88k/process.S b/sys/arch/mvme88k/mvme88k/process.S index beec7ec39ed..9584d690fd4 100644 --- a/sys/arch/mvme88k/mvme88k/process.S +++ b/sys/arch/mvme88k/mvme88k/process.S @@ -1,4 +1,4 @@ -/* $OpenBSD: process.S,v 1.16 2003/08/03 23:34:09 miod Exp $ */ +/* $OpenBSD: process.S,v 1.17 2003/08/10 21:34:20 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. @@ -71,7 +71,7 @@ ENTRY(switch_exit) */ or.u r30, r0, hi16(_idle_u) or r30, r30,lo16(_idle_u) - addu r31, r30, UPAGES * NBPG /* now on idle_u stack */ + addu r31, r30, USIZE /* now on idle_u stack */ or.u r10, r0, hi16(_curpcb) st r30, r10,lo16(_curpcb) /* curpcb = &idle_u */ or.u r10, r0, hi16(_curproc) |