>Number:         24442
>Category:       port-i386
>Synopsis:       DUMMY_NOPS doesn't exist any longer
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    port-i386-maintainer
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Feb 16 06:07:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jeff Rizzo
>Release:        NetBSD 1.6ZK (20040215)
>Organization:
Jeff Rizzo                                         http://boogers.sf.ca.us/~riz
>Environment:
	
	
System: NetBSD boogers.sf.ca.us 1.6ZG NetBSD 1.6ZG (GENERIC) #0: Sun Dec 7 23:40:12 UTC 2003 cyber@tgm.netbsd.org:/autobuild/HEAD/i386/OBJ/autobuild/HEAD/src/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
	DUMMY_NOPS was removed from locore.s in Jan 2003;  there's
	still related cruft in /sys/arch/i386
>How-To-Repeat:
	examine kernel config files in /sys/arch/i386
>Fix:
	apply the following patch in /sys/arch/i386.  (if it doesn't
	come across correctly, the patch can be retrieved at
	http://www.boogers.sf.ca.us/~riz/no-dummy.patch )

Index: conf/DELPHI
===================================================================
RCS file: /usr/mirror/main/src/sys/arch/i386/conf/DELPHI,v
retrieving revision 1.33
diff -u -r1.33 DELPHI
--- conf/DELPHI	14 Dec 2003 01:32:02 -0000	1.33
+++ conf/DELPHI	16 Feb 2004 05:56:16 -0000
@@ -21,8 +21,6 @@
 #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
Index: conf/DISKLESS
===================================================================
RCS file: /usr/mirror/main/src/sys/arch/i386/conf/DISKLESS,v
retrieving revision 1.94
diff -u -r1.94 DISKLESS
--- conf/DISKLESS	15 May 2003 13:13:23 -0000	1.94
+++ conf/DISKLESS	16 Feb 2004 05:56:16 -0000
@@ -25,7 +25,6 @@
 #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
 
Index: conf/GENERIC_LAPTOP
===================================================================
RCS file: /usr/mirror/main/src/sys/arch/i386/conf/GENERIC_LAPTOP,v
retrieving revision 1.88
diff -u -r1.88 GENERIC_LAPTOP
--- conf/GENERIC_LAPTOP	23 Jan 2004 13:43:46 -0000	1.88
+++ conf/GENERIC_LAPTOP	16 Feb 2004 05:56:16 -0000
@@ -22,8 +22,6 @@
 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
Index: conf/GENERIC_PS2TINY
===================================================================
RCS file: /usr/mirror/main/src/sys/arch/i386/conf/GENERIC_PS2TINY,v
retrieving revision 1.23
diff -u -r1.23 GENERIC_PS2TINY
--- conf/GENERIC_PS2TINY	10 Apr 2003 22:06:58 -0000	1.23
+++ conf/GENERIC_PS2TINY	16 Feb 2004 05:56:16 -0000
@@ -25,8 +25,6 @@
 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
Index: conf/INSTALL
===================================================================
RCS file: /usr/mirror/main/src/sys/arch/i386/conf/INSTALL,v
retrieving revision 1.237
diff -u -r1.237 INSTALL
--- conf/INSTALL	17 Dec 2003 09:18:45 -0000	1.237
+++ conf/INSTALL	16 Feb 2004 05:56:16 -0000
@@ -33,8 +33,6 @@
 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
Index: conf/INSTALL_LAPTOP
===================================================================
RCS file: /usr/mirror/main/src/sys/arch/i386/conf/INSTALL_LAPTOP,v
retrieving revision 1.56
diff -u -r1.56 INSTALL_LAPTOP
--- conf/INSTALL_LAPTOP	14 Dec 2003 09:54:01 -0000	1.56
+++ conf/INSTALL_LAPTOP	16 Feb 2004 05:56:16 -0000
@@ -33,8 +33,6 @@
 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
Index: conf/IOPENER
===================================================================
RCS file: /usr/mirror/main/src/sys/arch/i386/conf/IOPENER,v
retrieving revision 1.43
diff -u -r1.43 IOPENER
--- conf/IOPENER	14 Dec 2003 01:32:02 -0000	1.43
+++ conf/IOPENER	16 Feb 2004 05:56:16 -0000
@@ -17,8 +17,6 @@
 # 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
Index: conf/LAMB
===================================================================
RCS file: /usr/mirror/main/src/sys/arch/i386/conf/LAMB,v
retrieving revision 1.34
diff -u -r1.34 LAMB
--- conf/LAMB	9 Sep 2003 07:14:01 -0000	1.34
+++ conf/LAMB	16 Feb 2004 05:56:16 -0000
@@ -21,8 +21,6 @@
 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
Index: conf/NET4501
===================================================================
RCS file: /usr/mirror/main/src/sys/arch/i386/conf/NET4501,v
retrieving revision 1.24
diff -u -r1.24 NET4501
--- conf/NET4501	11 Jan 2004 12:55:19 -0000	1.24
+++ conf/NET4501	16 Feb 2004 05:56:16 -0000
@@ -30,8 +30,6 @@
 #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
Index: conf/SWINGER
===================================================================
RCS file: /usr/mirror/main/src/sys/arch/i386/conf/SWINGER,v
retrieving revision 1.46
diff -u -r1.46 SWINGER
--- conf/SWINGER	18 Oct 2003 08:12:07 -0000	1.46
+++ conf/SWINGER	16 Feb 2004 05:56:16 -0000
@@ -22,8 +22,6 @@
 #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
Index: conf/files.i386
===================================================================
RCS file: /usr/mirror/main/src/sys/arch/i386/conf/files.i386,v
retrieving revision 1.248
diff -u -r1.248 files.i386
--- conf/files.i386	14 Feb 2004 14:33:28 -0000	1.248
+++ conf/files.i386	16 Feb 2004 05:56:16 -0000
@@ -31,9 +31,6 @@
 # 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
 
Index: i386/locore.S
===================================================================
RCS file: /usr/mirror/main/src/sys/arch/i386/i386/locore.S,v
retrieving revision 1.22
diff -u -r1.22 locore.S
--- i386/locore.S	13 Feb 2004 11:36:13 -0000	1.22
+++ i386/locore.S	16 Feb 2004 05:56:16 -0000
@@ -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"
>Release-Note:
>Audit-Trail:
>Unformatted: