From bb3980ab7adf25719ba74ccdb2d48d147dbd81f0 Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 16 Feb 2004 17:11:26 +0000 Subject: [PATCH] Remove last traces of DUMMY_NOPS option that was removed some time ago. From Jeff Rizzo in PR 24442. --- sys/arch/i386/conf/DELPHI | 6 ++---- sys/arch/i386/conf/DISKLESS | 3 +-- sys/arch/i386/conf/GENERIC_LAPTOP | 6 ++---- sys/arch/i386/conf/GENERIC_PS2TINY | 4 +--- sys/arch/i386/conf/INSTALL | 4 +--- sys/arch/i386/conf/INSTALL_LAPTOP | 4 +--- sys/arch/i386/conf/IOPENER | 6 ++---- sys/arch/i386/conf/LAMB | 4 +--- sys/arch/i386/conf/NET4501 | 6 ++---- sys/arch/i386/conf/SWINGER | 6 ++---- sys/arch/i386/conf/files.i386 | 5 +---- sys/arch/i386/i386/locore.S | 3 +-- 12 files changed, 17 insertions(+), 40 deletions(-) diff --git a/sys/arch/i386/conf/DELPHI b/sys/arch/i386/conf/DELPHI index c229ab1b29c8..bc7896e855a2 100644 --- a/sys/arch/i386/conf/DELPHI +++ b/sys/arch/i386/conf/DELPHI @@ -1,4 +1,4 @@ -# $NetBSD: DELPHI,v 1.33 2003/12/14 01:32:02 thorpej Exp $ +# $NetBSD: DELPHI,v 1.34 2004/02/16 17:11:26 wiz Exp $ # # DELPHI -- one of thorpej@zembu.com's devel machines # @@ -7,7 +7,7 @@ include "arch/i386/conf/std.i386" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident "DELPHI-$Revision: 1.33 $" +ident "DELPHI-$Revision: 1.34 $" maxusers 64 # estimated number of users @@ -21,8 +21,6 @@ options I686_CPU #options MATH_EMULATE # floating point emulation #options VM86 # virtual 8086 emulation options USER_LDT # user-settable LDT; used by WINE -# eliminate delay no-ops in I/O; recommended on all but very old machines -options DUMMY_NOPS # delay between "rebooting ..." message and hardware reset, in milliseconds #options CPURESET_DELAY=2000 diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS index 33ca71bd871c..ed528f1d51fe 100644 --- a/sys/arch/i386/conf/DISKLESS +++ b/sys/arch/i386/conf/DISKLESS @@ -1,4 +1,4 @@ -# $NetBSD: DISKLESS,v 1.94 2003/05/15 13:13:23 wiz Exp $ +# $NetBSD: DISKLESS,v 1.95 2004/02/16 17:11:26 wiz Exp $ # # DISKLESS -- Generic machine setup for diskless boot. # This kernel can be loaded from a bootable floppy (i.e. kernel-copy) @@ -25,7 +25,6 @@ options USER_LDT # user-settable LDT; used by WINE #options REALBASEMEM=... # size of base memory #options REALEXTMEM=... # size of extended memory -#options DUMMY_NOPS # speed hack; recommended options XSERVER options INSECURE # insecure; allow /dev/mem writing for X diff --git a/sys/arch/i386/conf/GENERIC_LAPTOP b/sys/arch/i386/conf/GENERIC_LAPTOP index 0f37aa5eee84..609b4c7ffbb1 100644 --- a/sys/arch/i386/conf/GENERIC_LAPTOP +++ b/sys/arch/i386/conf/GENERIC_LAPTOP @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_LAPTOP,v 1.88 2004/01/23 13:43:46 jdolecek Exp $ +# $NetBSD: GENERIC_LAPTOP,v 1.89 2004/02/16 17:11:26 wiz Exp $ # From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp # # GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled @@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.88 $" +#ident "GENERIC-$Revision: 1.89 $" maxusers 32 # estimated number of users @@ -22,8 +22,6 @@ options I686_CPU options MATH_EMULATE # floating point emulation options VM86 # virtual 8086 emulation options USER_LDT # user-settable LDT; used by WINE -# eliminate delay no-ops in I/O; recommended on all but very old machines -#options DUMMY_NOPS options MTRR # memory-type range register syscall support #options PERFCTRS # performance-monitoring counters support diff --git a/sys/arch/i386/conf/GENERIC_PS2TINY b/sys/arch/i386/conf/GENERIC_PS2TINY index e78a73f776ca..e72912e533cb 100644 --- a/sys/arch/i386/conf/GENERIC_PS2TINY +++ b/sys/arch/i386/conf/GENERIC_PS2TINY @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_PS2TINY,v 1.23 2003/04/10 22:06:58 christos Exp $ +# $NetBSD: GENERIC_PS2TINY,v 1.24 2004/02/16 17:11:26 wiz Exp $ # # GENERIC-style kernel config for IBM PS/2 with MCA bus. It only contains # IBM PS/2 related stuff and has been generally trimmed down somewhat, @@ -25,8 +25,6 @@ options I586_CPU options MATH_EMULATE # floating point emulation options VM86 # virtual 8086 emulation options USER_LDT # user-settable LDT; used by WINE -# eliminate delay no-ops in I/O; recommended on all but very old machines -#options DUMMY_NOPS # delay between "rebooting ..." message and hardware reset, in milliseconds #options CPURESET_DELAY=2000 diff --git a/sys/arch/i386/conf/INSTALL b/sys/arch/i386/conf/INSTALL index 1ee99ab7f75e..d0b5d80a9603 100644 --- a/sys/arch/i386/conf/INSTALL +++ b/sys/arch/i386/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.237 2003/12/17 09:18:45 tls Exp $ +# $NetBSD: INSTALL,v 1.238 2004/02/16 17:11:26 wiz Exp $ # # INSTALL - Installation kernel. # @@ -33,8 +33,6 @@ options I686_CPU options MATH_EMULATE # floating point emulation #options VM86 # virtual 8086 emulation #options USER_LDT # user-settable LDT; used by WINE -# eliminate delay no-ops in I/O; recommended on all but very old machines -#options DUMMY_NOPS # Misc. i386-specific options #options XSERVER # X server support in console drivers diff --git a/sys/arch/i386/conf/INSTALL_LAPTOP b/sys/arch/i386/conf/INSTALL_LAPTOP index a26ec748a95a..28471d3c2a1b 100644 --- a/sys/arch/i386/conf/INSTALL_LAPTOP +++ b/sys/arch/i386/conf/INSTALL_LAPTOP @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_LAPTOP,v 1.56 2003/12/14 09:54:01 dyoung Exp $ +# $NetBSD: INSTALL_LAPTOP,v 1.57 2004/02/16 17:11:27 wiz Exp $ # # INSTALL - Installation kernel. # @@ -33,8 +33,6 @@ options I686_CPU options MATH_EMULATE # floating point emulation #options VM86 # virtual 8086 emulation #options USER_LDT # user-settable LDT; used by WINE -# eliminate delay no-ops in I/O; recommended on all but very old machines -#options DUMMY_NOPS # Misc. i386-specific options #options XSERVER # X server support in console drivers diff --git a/sys/arch/i386/conf/IOPENER b/sys/arch/i386/conf/IOPENER index 96e8eb128c7d..d5c94fa229b0 100644 --- a/sys/arch/i386/conf/IOPENER +++ b/sys/arch/i386/conf/IOPENER @@ -1,4 +1,4 @@ -# $NetBSD: IOPENER,v 1.43 2003/12/14 01:32:02 thorpej Exp $ +# $NetBSD: IOPENER,v 1.44 2004/02/16 17:11:27 wiz Exp $ # # IOPENER -- GENERIC-like kernel for the Netpliance i-opener # from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp @@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "IOPENER-$Revision: 1.43 $" +#ident "IOPENER-$Revision: 1.44 $" maxusers 32 # estimated number of users @@ -17,8 +17,6 @@ options I586_CPU # CPU-related options. #options VM86 # virtual 8086 emulation #options USER_LDT # user-settable LDT; used by WINE -# eliminate delay no-ops in I/O; recommended on all but very old machines -options DUMMY_NOPS # delay between "rebooting ..." message and hardware reset, in milliseconds #options CPURESET_DELAY=2000 diff --git a/sys/arch/i386/conf/LAMB b/sys/arch/i386/conf/LAMB index becc55d595fb..eb18b42183ce 100644 --- a/sys/arch/i386/conf/LAMB +++ b/sys/arch/i386/conf/LAMB @@ -1,4 +1,4 @@ -# $NetBSD: LAMB,v 1.34 2003/09/09 07:14:01 itojun Exp $ +# $NetBSD: LAMB,v 1.35 2004/02/16 17:11:27 wiz Exp $ # # LAMB - a complete kernel for wildlab LAMB, http://www.wildlab.com/ # @@ -21,8 +21,6 @@ options I686_CPU options MATH_EMULATE # floating point emulation options VM86 # virtual 8086 emulation options USER_LDT # user-settable LDT; used by WINE -# eliminate delay no-ops in I/O; recommended on all but very old machines -#options DUMMY_NOPS options MTRR # memory-type range register syscall support #options PERFCTRS # performance-monitoring counters support diff --git a/sys/arch/i386/conf/NET4501 b/sys/arch/i386/conf/NET4501 index 643c7e6b62bb..7f56f0e9a5bd 100644 --- a/sys/arch/i386/conf/NET4501 +++ b/sys/arch/i386/conf/NET4501 @@ -1,4 +1,4 @@ -# $NetBSD: NET4501,v 1.24 2004/01/11 12:55:19 cube Exp $ +# $NetBSD: NET4501,v 1.25 2004/02/16 17:11:27 wiz Exp $ # # NET4501 -- kernel configuration for a Soekris Engineering net4501 # single-board computer. @@ -10,7 +10,7 @@ include "arch/i386/conf/std.i386" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "NET4501-$Revision: 1.24 $" +#ident "NET4501-$Revision: 1.25 $" maxusers 32 # estimated number of users @@ -30,8 +30,6 @@ options VNODE_OP_NOINLINE #options MATH_EMULATE # floating point emulation #options VM86 # virtual 8086 emulation #options USER_LDT # user-settable LDT; used by WINE -# eliminate delay no-ops in I/O; recommended on all but very old machines -options DUMMY_NOPS #options MTRR # memory-type range register syscall support #options PERFCTRS # performance-monitoring counters support diff --git a/sys/arch/i386/conf/SWINGER b/sys/arch/i386/conf/SWINGER index 028e0ac2172e..d47d4e80da5d 100644 --- a/sys/arch/i386/conf/SWINGER +++ b/sys/arch/i386/conf/SWINGER @@ -1,4 +1,4 @@ -# $NetBSD: SWINGER,v 1.46 2003/10/18 08:12:07 lukem Exp $ +# $NetBSD: SWINGER,v 1.47 2004/02/16 17:11:27 wiz Exp $ # from NetBSD: GENERIC,v 1.325 2000/04/14 14:53:32 augustss Exp # # SWINGER -- thorpej's Abit BP6+dual Celeron @@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "SWINGER-$Revision: 1.46 $" +#ident "SWINGER-$Revision: 1.47 $" maxusers 64 # estimated number of users @@ -22,8 +22,6 @@ options I686_CPU #options MATH_EMULATE # floating point emulation options VM86 # virtual 8086 emulation options USER_LDT # user-settable LDT; used by WINE -# eliminate delay no-ops in I/O; recommended on all but very old machines -options DUMMY_NOPS # delay between "rebooting ..." message and hardware reset, in milliseconds #options CPURESET_DELAY=2000 diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index b54870805a3a..a0ce071a3921 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $NetBSD: files.i386,v 1.248 2004/02/14 14:33:28 bjh21 Exp $ +# $NetBSD: files.i386,v 1.249 2004/02/16 17:11:27 wiz Exp $ # # new style config file for i386 architecture # @@ -31,9 +31,6 @@ defflag MATH_EMULATE # User-settable LDT (used by WINE) defflag USER_LDT -# Speed hack; make NOPs dummies (might break on some machines) -defflag DUMMY_NOPS - # X server support in console drivers defflag opt_xserver.h XSERVER XSERVER_DDB diff --git a/sys/arch/i386/i386/locore.S b/sys/arch/i386/i386/locore.S index d6bcb394c552..9820830500da 100644 --- a/sys/arch/i386/i386/locore.S +++ b/sys/arch/i386/i386/locore.S @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.22 2004/02/13 11:36:13 wiz Exp $ */ +/* $NetBSD: locore.S,v 1.23 2004/02/16 17:11:27 wiz Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -74,7 +74,6 @@ #include "opt_compat_oldboot.h" #include "opt_cputype.h" #include "opt_ddb.h" -#include "opt_dummy_nops.h" #include "opt_ipkdb.h" #include "opt_lockdebug.h" #include "opt_multiprocessor.h"