From 5b6f2046cc7e7d0ee8db638e15d9867c14542674 Mon Sep 17 00:00:00 2001 From: fvdl Date: Mon, 10 Sep 2001 10:17:29 +0000 Subject: [PATCH] Add MTRR option. --- sys/arch/i386/conf/GENERIC | 6 ++++-- sys/arch/i386/conf/GENERIC_LAPTOP | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 130ef388554c..100d40c0ac6e 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,11 +1,11 @@ -# $NetBSD: GENERIC,v 1.422 2001/09/07 00:18:27 lukem Exp $ +# $NetBSD: GENERIC,v 1.423 2001/09/10 10:17:29 fvdl Exp $ # # GENERIC -- everything that's currently supported # include "arch/i386/conf/std.i386" -#ident "GENERIC-$Revision: 1.422 $" +#ident "GENERIC-$Revision: 1.423 $" maxusers 32 # estimated number of users @@ -22,6 +22,8 @@ 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 + # 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 24be5da48cf1..f6f298325bac 100644 --- a/sys/arch/i386/conf/GENERIC_LAPTOP +++ b/sys/arch/i386/conf/GENERIC_LAPTOP @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_LAPTOP,v 1.20 2001/09/01 21:52:27 atatat Exp $ +# $NetBSD: GENERIC_LAPTOP,v 1.21 2001/09/10 10:17:30 fvdl 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 @@ -6,7 +6,7 @@ include "arch/i386/conf/std.i386" -#ident "GENERIC-$Revision: 1.20 $" +#ident "GENERIC-$Revision: 1.21 $" maxusers 32 # estimated number of users @@ -23,6 +23,8 @@ 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 + # delay between "rebooting ..." message and hardware reset, in milliseconds #options CPURESET_DELAY=2000