diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/luna88k/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/luna88k/conf/RAMDISK | 4 | ||||
| -rw-r--r-- | sys/arch/m88k/m88k/pmap.c | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/M188 | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/M197 | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/Makefile.mvme88k | 7 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/RAMDISK | 4 |
8 files changed, 9 insertions, 25 deletions
diff --git a/sys/arch/luna88k/conf/GENERIC b/sys/arch/luna88k/conf/GENERIC index 9c3369e6ace..8fadfc286af 100644 --- a/sys/arch/luna88k/conf/GENERIC +++ b/sys/arch/luna88k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.10 2005/08/03 02:10:44 dlg Exp $ +# $OpenBSD: GENERIC,v 1.11 2005/09/06 19:21:55 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -13,8 +13,6 @@ machine luna88k m88k include "../../../conf/GENERIC" maxusers 64 # estimated number of users -option "NCPUS=1" # number of CPUs supported (max 4) - # Processor type option M88100 # 88100 support; mandatory diff --git a/sys/arch/luna88k/conf/RAMDISK b/sys/arch/luna88k/conf/RAMDISK index c57fb9218b7..11d90b50bb3 100644 --- a/sys/arch/luna88k/conf/RAMDISK +++ b/sys/arch/luna88k/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.6 2005/05/01 07:54:42 david Exp $ +# $OpenBSD: RAMDISK,v 1.7 2005/09/06 19:21:55 miod Exp $ machine luna88k m88k @@ -6,8 +6,6 @@ machine luna88k m88k option MINIROOTSIZE=4096 option RAMDISK_HOOKS -option "NCPUS=1" # number of CPUs supported (max 4) - # Processor type option M88100 # 88100 support; mandatory diff --git a/sys/arch/m88k/m88k/pmap.c b/sys/arch/m88k/m88k/pmap.c index 6dc27f9ad0d..6c7d6a1638c 100644 --- a/sys/arch/m88k/m88k/pmap.c +++ b/sys/arch/m88k/m88k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.9 2005/05/22 19:40:51 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.10 2005/09/06 19:21:57 miod Exp $ */ /* * Copyright (c) 2001-2004, Miodrag Vallat * Copyright (c) 1998-2001 Steve Murphree, Jr. @@ -210,7 +210,7 @@ boolean_t pmap_testbit(struct vm_page *, int); static __inline__ void flush_atc_entry(long users, vaddr_t va, boolean_t kernel) { -#if NCPUS > 1 +#if defined(MULTIPROCESSOR) int cpu; if (users == 0) diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC index 07f902e363c..ab1e26f6be2 100644 --- a/sys/arch/mvme88k/conf/GENERIC +++ b/sys/arch/mvme88k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.48 2005/08/03 02:10:44 dlg Exp $ +# $OpenBSD: GENERIC,v 1.49 2005/09/06 19:21:57 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -20,7 +20,6 @@ option M88110 option MVME187 # support for 187 (requires M88100) option MVME188 # support for 188 (requires M88100) option MVME197 # support for 197 (requires M88110) -option "NCPUS=1" # number of CPUs supported (max 4) # Define this if your processor has the xxx.usr bug (mask C82N) option ERRATA__XXX_USR diff --git a/sys/arch/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188 index a1b29f2a799..9d0c6841a4a 100644 --- a/sys/arch/mvme88k/conf/M188 +++ b/sys/arch/mvme88k/conf/M188 @@ -1,4 +1,4 @@ -# $OpenBSD: M188,v 1.24 2004/09/16 09:14:03 mickey Exp $ +# $OpenBSD: M188,v 1.25 2005/09/06 19:21:57 miod Exp $ machine mvme88k m88k @@ -10,8 +10,6 @@ option M88110 option MVME188 # support for 188 (requires M88100) -option "NCPUS=1" # Number of cpus supported (max 4) - # Define this if your processor has the xxx.usr bug (mask C82N) option ERRATA__XXX_USR diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197 index cb51a5e9b14..b243b518887 100644 --- a/sys/arch/mvme88k/conf/M197 +++ b/sys/arch/mvme88k/conf/M197 @@ -1,4 +1,4 @@ -# $OpenBSD: M197,v 1.27 2005/05/01 07:54:42 david Exp $ +# $OpenBSD: M197,v 1.28 2005/09/06 19:21:57 miod Exp $ machine mvme88k m88k @@ -9,8 +9,6 @@ option M88110 option MVME197 # support for 197 (requires M88110) -option "NCPUS=1" # Number of cpus supported (max 4) - maxusers 64 config bsd swap on generic diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k index f513d78912a..2be5d2026d6 100644 --- a/sys/arch/mvme88k/conf/Makefile.mvme88k +++ b/sys/arch/mvme88k/conf/Makefile.mvme88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme88k,v 1.36 2004/07/13 09:47:06 miod Exp $ +# $OpenBSD: Makefile.mvme88k,v 1.37 2005/09/06 19:21:57 miod Exp $ # # Makefile for OpenBSD # @@ -55,11 +55,6 @@ HOSTED_CFLAGS?= ${CFLAGS} ### CPU configuration -# syntaxic sugar for 187, which does not exist with multiple processors -.if (${IDENT:M-DMVME187} != "" && ${IDENT:M-DNCPUS} == "") -CPPFLAGS+= -DNCPUS=1 -.endif - ### find out what to use for libkern .include "$S/lib/libkern/Makefile.inc" .ifndef PROF diff --git a/sys/arch/mvme88k/conf/RAMDISK b/sys/arch/mvme88k/conf/RAMDISK index d3d6825d0da..bb7ef15e9c3 100644 --- a/sys/arch/mvme88k/conf/RAMDISK +++ b/sys/arch/mvme88k/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.26 2005/05/01 07:54:42 david Exp $ +# $OpenBSD: RAMDISK,v 1.27 2005/09/06 19:21:57 miod Exp $ machine mvme88k m88k @@ -14,8 +14,6 @@ option MVME187 # support for 187 (requires M88100) option MVME188 # support for 188 (requires M88100) option MVME197 # support for 197 (requires M88110) -option "NCPUS=1" # number of CPUs supported (max 4) - # Define this if your processor has the xxx.usr bug (mask C82N) option ERRATA__XXX_USR |