diff options
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISKB | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISKC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/locore.s | 12 | ||||
| -rw-r--r-- | sys/arch/i386/include/i8259.h | 16 |
7 files changed, 11 insertions, 37 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index f5ac878926b..0faddab00cc 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.482 2006/04/10 17:30:38 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.483 2006/04/14 21:52:47 weingart Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -28,8 +28,6 @@ option APERTURE # in-kernel aperture driver for XFree86 #option KGDB # Remote debugger support; exclusive of DDB #option "KGDB_DEVNAME=\"pccom\"",KGDBADDR=0x2f8,KGDBRATE=9600 -#option DUMMY_NOPS # speed hack; recommended - option COMPAT_SVR4 # binary compatibility with SVR4 option COMPAT_IBCS2 # binary compatibility with SCO and ISC option COMPAT_LINUX # binary compatibility with Linux diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index 0d7041275b7..5069bb66199 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.142 2006/03/12 17:29:49 martin Exp $ +# $OpenBSD: RAMDISK,v 1.143 2006/04/14 21:52:47 weingart Exp $ machine i386 # architecture, used by config; REQUIRED @@ -14,8 +14,6 @@ option I686_CPU option SMALL_KERNEL option NO_PROPOLICE -#option DUMMY_NOPS # speed hack; recommended - maxusers 4 # estimated number of users option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB index 97fd48c2304..e07765b6f18 100644 --- a/sys/arch/i386/conf/RAMDISKB +++ b/sys/arch/i386/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.86 2006/03/12 17:29:49 martin Exp $ +# $OpenBSD: RAMDISKB,v 1.87 2006/04/14 21:52:47 weingart Exp $ machine i386 # architecture, used by config; REQUIRED @@ -14,8 +14,6 @@ option I686_CPU option SMALL_KERNEL option NO_PROPOLICE -#option DUMMY_NOPS # speed hack; recommended - maxusers 4 # estimated number of users option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC index fba14e451bf..8a8d6114a38 100644 --- a/sys/arch/i386/conf/RAMDISKC +++ b/sys/arch/i386/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.65 2006/03/12 17:29:49 martin Exp $ +# $OpenBSD: RAMDISKC,v 1.66 2006/04/14 21:52:47 weingart Exp $ machine i386 # architecture, used by config; REQUIRED @@ -14,8 +14,6 @@ option I686_CPU option SMALL_KERNEL option NO_PROPOLICE -#option DUMMY_NOPS # speed hack; recommended - maxusers 4 # estimated number of users option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 73051e98a9b..f3c54eb2599 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.114 2006/03/12 17:29:49 martin Exp $ +# $OpenBSD: RAMDISK_CD,v 1.115 2006/04/14 21:52:47 weingart Exp $ machine i386 # architecture, used by config; REQUIRED @@ -14,8 +14,6 @@ option I686_CPU option SMALL_KERNEL option NO_PROPOLICE -#option DUMMY_NOPS # speed hack; recommended - maxusers 4 # estimated number of users option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s index db544a01411..96ab432c8b1 100644 --- a/sys/arch/i386/i386/locore.s +++ b/sys/arch/i386/i386/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.97 2006/03/14 12:25:20 mickey Exp $ */ +/* $OpenBSD: locore.s,v 1.98 2006/04/14 21:52:47 weingart Exp $ */ /* $NetBSD: locore.s,v 1.145 1996/05/03 19:41:19 christos Exp $ */ /*- @@ -79,16 +79,6 @@ #define _ALIGN_TEXT ALIGN_TEXT #include <machine/asm.h> -/* NB: NOP now preserves registers so NOPs can be inserted anywhere */ -/* XXX: NOP and FASTER_NOP are misleadingly named */ -#ifdef DUMMY_NOPS /* this will break some older machines */ -#define FASTER_NOP -#define NOP -#else -#define FASTER_NOP pushl %eax ; inb $0x84,%al ; popl %eax -#define NOP pushl %eax ; inb $0x84,%al ; inb $0x84,%al ; popl %eax -#endif - #define CPL _C_LABEL(lapic_tpr) #if defined(MULTIPROCESSOR) diff --git a/sys/arch/i386/include/i8259.h b/sys/arch/i386/include/i8259.h index f1c4462e4d0..06ffdd1a3e5 100644 --- a/sys/arch/i386/include/i8259.h +++ b/sys/arch/i386/include/i8259.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i8259.h,v 1.2 2004/06/13 21:49:16 niklas Exp $ */ +/* $OpenBSD: i8259.h,v 1.3 2006/04/14 21:52:47 weingart Exp $ */ /* $NetBSD: i8259.h,v 1.3 2003/05/04 22:01:56 fvdl Exp $ */ /*- @@ -116,14 +116,8 @@ extern void i8259_reinit(void); #define i8259_asm_ack2(num) #endif -#ifndef DUMMY_NOPS -#define PIC_MASKDELAY -#endif - -#ifdef PIC_MASKDELAY -#define MASKDELAY pushl %eax ; inb $0x84,%al ; popl %eax -#else -#define MASKDELAY +#ifndef PIC_MASKDELAY +#define PIC_MASKDELAY pushl %eax ; inb $0x84,%al ; popl %eax #endif #ifdef ICU_HARDWARE_MASK @@ -132,14 +126,14 @@ extern void i8259_reinit(void); movb CVAROFF(imen, IRQ_BYTE(num)),%al ;\ orb $IRQ_BIT(num),%al ;\ movb %al,CVAROFF(imen, IRQ_BYTE(num)) ;\ - MASKDELAY ;\ + PIC_MASKDELAY ;\ outb %al,$(ICUADDR+1) #define i8259_asm_unmask(num) \ cli ;\ movb CVAROFF(imen, IRQ_BYTE(num)),%al ;\ andb $~IRQ_BIT(num),%al ;\ movb %al,CVAROFF(imen, IRQ_BYTE(num)) ;\ - MASKDELAY ;\ + PIC_MASKDELAY ;\ outb %al,$(ICUADDR+1) ;\ sti |