From c1eea89f58e9f16b5e20fa9e85638d8c73a29beb Mon Sep 17 00:00:00 2001 From: Peter Hessler Date: Wed, 11 Jun 2008 09:22:40 +0000 Subject: Synchronize the MTRR API with i386, and enable "just commit it" deraadt@ --- sys/arch/amd64/conf/GENERIC | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sys/arch/amd64/conf/GENERIC') diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 0bb94c73392..54837df157a 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.232 2008/06/07 17:00:38 marco Exp $ +# $OpenBSD: GENERIC,v 1.233 2008/06/11 09:22:39 phessler Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -17,7 +17,7 @@ option USER_PCICONF # user-space PCI configuration #option VM86 # Virtual 8086 emulation option APERTURE # in-kernel aperture driver for XFree86 -#option MTRR # CPU memory range attributes control +option MTRR # CPU memory range attributes control #option KGDB # Remote debugger support; exclusive of DDB #option "KGDB_DEVNAME=\"com\"",KGDBADDR=0x2f8,KGDBRATE=9600 @@ -561,6 +561,7 @@ pseudo-device nvram 1 pseudo-device sequencer 1 #pseudo-device raid 4 # RAIDframe disk driver pseudo-device hotplug 1 # devices hot plugging +pseudo-device mtrr 1 # Memory range attributes control # mouse & keyboard multiplexor pseudo-devices pseudo-device wsmux 2 -- cgit v1.2.3