diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2003-08-01 07:47:59 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2003-08-01 07:47:59 +0000 |
| commit | 353b7ac6f7cf7fa2bc22437f850b6e9628bb457e (patch) | |
| tree | 0ae2b33bb394f06a15755a26b43207b73d76c3e1 | |
| parent | 5a797cd7d292eeac3bb14efad6b5ac0b227a0dff (diff) | |
Compensate for the assym.h lossage, which defines NBPG for now (this will be
cleaned up soon...)
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/locore_c_routines.c | 3 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/machdep.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/arch/mvme88k/mvme88k/locore_c_routines.c b/sys/arch/mvme88k/mvme88k/locore_c_routines.c index dfbc57a2903..6dfec40381e 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.27 2003/01/14 03:20:16 miod Exp $ */ +/* $OpenBSD: locore_c_routines.c,v 1.28 2003/08/01 07:47:58 miod Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -27,6 +27,7 @@ */ #include "assym.h" +#undef NBPG /* gasp */ #include <sys/param.h> #include <sys/types.h> diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c index 8e37ce4f836..1bf6203f03b 100644 --- a/sys/arch/mvme88k/mvme88k/machdep.c +++ b/sys/arch/mvme88k/mvme88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.101 2003/05/11 19:41:11 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.102 2003/08/01 07:47:58 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -98,7 +98,6 @@ #include <mvme88k/dev/pcctworeg.h> #include <mvme88k/dev/busswreg.h> -#include "assym.h" /* EF_EPSR, etc. */ #include "ksyms.h" #if DDB #include <machine/db_machdep.h> @@ -2399,6 +2398,7 @@ mvme_bootstrap() last_addr = memsize187(); break; #endif +#if defined(MVME188) || defined(MVME197) #ifdef MVME188 case BRD_188: #endif @@ -2407,6 +2407,9 @@ mvme_bootstrap() #endif last_addr = size_memory(); break; +#endif + default: + break; } physmem = btoc(last_addr); |