diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2003-05-14 22:54:00 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2003-05-14 22:54:00 +0000 |
| commit | 784b6fb929f4c9d842ecf7a0212708317b7cf7fb (patch) | |
| tree | 2c4799884852f736995e5781b5cceeb6fddadc7b | |
| parent | 1cc6f609cd8da6f3df93cb3d1dcc3be06295999c (diff) | |
remove option LONGRUN; it's in everything but SMALL_KERNEL now
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 515b6d6a992..53963dca671 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.335 2003/05/14 22:08:04 tedu Exp $ +# $OpenBSD: GENERIC,v 1.336 2003/05/14 22:53:59 tedu Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -19,7 +19,6 @@ option USER_PCICONF # user-space PCI configuration #option VM86 # Virtual 8086 emulation option USER_LDT # user-settable LDT; see i386_set_ldt(2) option APERTURE # in-kernel aperture driver for XFree86 -option LONGRUN # Transmeta Longrun power management #option KGDB # Remote debugger support; exclusive of DDB #option "KGDB_DEVNAME=\"pccom\"",KGDBADDR=0x2f8,KGDBRATE=9600 diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 22e8135b0c1..bd9c620e6fb 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.103 2003/05/14 22:08:04 tedu Exp $ +# $OpenBSD: files.i386,v 1.104 2003/05/14 22:53:59 tedu Exp $ # $NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $ # # new style config file for i386 architecture @@ -24,7 +24,7 @@ file arch/i386/i386/in_cksum.s inet file arch/i386/i386/ipx_cksum.c ipx file arch/i386/i386/machdep.c file arch/i386/i386/kgdb_machdep.c kgdb -file arch/i386/i386/longrun.c longrun +file arch/i386/i386/longrun.c !small_kernel file arch/i386/i386/math_emulate.c math_emulate file arch/i386/i386/mem.c file arch/i386/i386/i686_mem.c mtrr diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 76fb3c84632..48edd5ae078 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.230 2003/05/14 22:08:04 tedu Exp $ */ +/* $OpenBSD: machdep.c,v 1.231 2003/05/14 22:53:59 tedu Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -1253,7 +1253,7 @@ tm86_cpu_setup(cpu_device, model, step) const char *cpu_device; int model, step; { -#ifdef LONGRUN +#ifndef SMALL_KERNEL extern int longrun_enabled; longrun_enabled = 1; @@ -2670,7 +2670,7 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p) return (sysctl_int(oldp, oldlenp, newp, newlen, &user_ldt_enable)); #endif -#ifdef LONGRUN +#ifndef SMALL_KERNEL case CPU_LONGRUN: return (longrun_sysctl(oldp, oldlenp, newp, newlen)); #endif |