diff --git a/sys/arch/i386/conf/CARDBUS b/sys/arch/i386/conf/CARDBUS index c0b4e1f3e187..18a292bdf60a 100644 --- a/sys/arch/i386/conf/CARDBUS +++ b/sys/arch/i386/conf/CARDBUS @@ -1,4 +1,4 @@ -# $NetBSD: CARDBUS,v 1.58 2002/04/25 15:06:28 atatat Exp $ +# $NetBSD: CARDBUS,v 1.59 2002/06/06 21:16:47 gmcgarry Exp $ # # CARDBUS: GENERIC + CardBus support. Additionally, some # things typically not found on laptops have been commented out. @@ -10,7 +10,7 @@ include "arch/i386/conf/std.i386" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "CARDBUS-$Revision: 1.58 $" +#ident "CARDBUS-$Revision: 1.59 $" maxusers 32 # estimated number of users @@ -28,6 +28,7 @@ options USER_LDT # user-settable LDT; used by WINE #options DUMMY_NOPS options MTRR # memory-type range register syscall support +options PERFCTRS # performance-monitoring counters support # delay between "rebooting ..." message and hardware reset, in milliseconds #options CPURESET_DELAY=2000 diff --git a/sys/arch/i386/conf/DR-EVIL b/sys/arch/i386/conf/DR-EVIL index 1b32916ddab9..da03b50a0e33 100644 --- a/sys/arch/i386/conf/DR-EVIL +++ b/sys/arch/i386/conf/DR-EVIL @@ -1,4 +1,4 @@ -# $NetBSD: DR-EVIL,v 1.44 2002/04/25 15:06:28 atatat Exp $ +# $NetBSD: DR-EVIL,v 1.45 2002/06/06 21:16:48 gmcgarry Exp $ # # DR-EVIL -- Dell Inspiron 3800 laptop used by thorpej@netbsd.org # @@ -27,6 +27,7 @@ options __AUDIT__ #options VM86 # virtual 8086 emulation options USER_LDT # user-settable LDT; used by WINE #options MTRR # MTRR support +#options PERFCTRS # performance-monitoring counters support # eliminate delay no-ops in I/O; recommended on all but very old machines options DUMMY_NOPS diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 14418ef24c3e..4b2c4c3bedf1 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.492 2002/05/25 17:05:33 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.493 2002/06/06 21:16:48 gmcgarry Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.492 $" +#ident "GENERIC-$Revision: 1.493 $" maxusers 32 # estimated number of users @@ -40,6 +40,7 @@ options USER_LDT # user-settable LDT; used by WINE #options DUMMY_NOPS options MTRR # memory-type range register syscall support +options PERFCTRS # performance-monitoring counters support # delay between "rebooting ..." message and hardware reset, in milliseconds #options CPURESET_DELAY=2000 diff --git a/sys/arch/i386/conf/GENERIC_LAPTOP b/sys/arch/i386/conf/GENERIC_LAPTOP index 99c719929cb6..710acd07707b 100644 --- a/sys/arch/i386/conf/GENERIC_LAPTOP +++ b/sys/arch/i386/conf/GENERIC_LAPTOP @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_LAPTOP,v 1.50 2002/04/25 15:06:29 atatat Exp $ +# $NetBSD: GENERIC_LAPTOP,v 1.51 2002/06/06 21:16:49 gmcgarry 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.50 $" +#ident "GENERIC-$Revision: 1.51 $" maxusers 32 # estimated number of users @@ -26,6 +26,7 @@ options USER_LDT # user-settable LDT; used by WINE #options DUMMY_NOPS options MTRR # memory-type range register syscall support +options PERFCTRS # performance-monitoring counters support # 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 13e3dabd8548..eac61ecc3795 100644 --- a/sys/arch/i386/conf/LAMB +++ b/sys/arch/i386/conf/LAMB @@ -1,4 +1,4 @@ -# $NetBSD: LAMB,v 1.22 2002/04/25 15:06:29 atatat Exp $ +# $NetBSD: LAMB,v 1.23 2002/06/06 21:16:49 gmcgarry Exp $ # # LAMB - a complete kernel for wildlab LAMB, http://www.wildlab.com/ # @@ -7,7 +7,7 @@ include "arch/i386/conf/std.i386" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.22 $" +#ident "GENERIC-$Revision: 1.23 $" maxusers 32 # estimated number of users @@ -25,6 +25,7 @@ options USER_LDT # user-settable LDT; used by WINE #options DUMMY_NOPS options MTRR # memory-type range register syscall support +options PERFCTRS # performance-monitoring counters support # delay between "rebooting ..." message and hardware reset, in milliseconds #options CPURESET_DELAY=2000 diff --git a/sys/arch/i386/conf/NET4501 b/sys/arch/i386/conf/NET4501 index d24b3b9053a7..b38ceb25994a 100644 --- a/sys/arch/i386/conf/NET4501 +++ b/sys/arch/i386/conf/NET4501 @@ -1,4 +1,4 @@ -# $NetBSD: NET4501,v 1.6 2002/04/25 15:06:30 atatat Exp $ +# $NetBSD: NET4501,v 1.7 2002/06/06 21:16:50 gmcgarry 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.6 $" +#ident "NET4501-$Revision: 1.7 $" maxusers 32 # estimated number of users @@ -31,6 +31,7 @@ options VNODE_OP_NOINLINE options DUMMY_NOPS #options MTRR # memory-type range register syscall support +#options PERFCTRS # performance-monitoring counters support # delay between "rebooting ..." message and hardware reset, in milliseconds #options CPURESET_DELAY=2000