From owner-p4-projects@FreeBSD.ORG Thu Mar 4 21:38:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1769916A4D0; Thu, 4 Mar 2004 21:38:33 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E2E3B16A4CE for ; Thu, 4 Mar 2004 21:38:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C996F43D31 for ; Thu, 4 Mar 2004 21:38:32 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i255cWGe063728 for ; Thu, 4 Mar 2004 21:38:32 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i255cWaJ063725 for perforce@freebsd.org; Thu, 4 Mar 2004 21:38:32 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 4 Mar 2004 21:38:32 -0800 (PST) Message-Id: <200403050538.i255cWaJ063725@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 48182 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Mar 2004 05:38:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=48182 Change 48182 by peter@peter_daintree on 2004/03/04 21:37:43 whitespace and gratuitous change sync Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#11 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#11 (text+ko) ==== @@ -3,9 +3,7 @@ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. -# (XXX from i386:NOTES,v 1.1106; merge in updates) -# $FreeBSD: src/sys/amd64/conf/NOTES.fixed,v 1.1 2004/02/29 19:32:02 peter Exp $ -# +# (XXX from i386:NOTES,v 1.1132) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.5 2004/03/03 09:26:40 obrien Exp $ # @@ -46,7 +44,7 @@ # # Optional: -device atpic +device atpic # Legacy pic device mptable options NO_MIXED_MODE # Disable use of mixed mode @@ -59,7 +57,7 @@ # deleting the specification for CPUs you don't need to use may make # parts of the system run faster. # -cpu HAMMER +cpu HAMMER # aka K8, aka Opteron & Athlon64 # # Options for CPU features. @@ -69,7 +67,7 @@ # PERFMON causes the driver for Pentium/Pentium Pro performance counters # to be compiled. See perfmon(4) for more information. # -#X#options PERFMON +#XXX#options PERFMON ##################################################################### @@ -185,7 +183,7 @@ # is to load both as modules. device tdfx # Enable 3Dfx Voodoo support -#X#options TDFX_LINUX # Enable Linuxulator support +#XXX#options TDFX_LINUX # Enable Linuxulator support # # ACPI support using the Intel ACPI Component Architecture reference @@ -247,8 +245,8 @@ #XXX#device ed #XXX#device lnc -#X#device ath -#X#device ath_hal # Atheros HAL (includes binary component) +#XXX#device ath +#XXX#device ath_hal # Atheros HAL (includes binary component) device wlan # 802.11 layer # @@ -259,7 +257,7 @@ # # SCSI host adapters: -# +# # ncv: NCR 53C500 based SCSI host adapters. # nsp: Workbit Ninja SCSI-3 based PC Card SCSI host adapters. # stg: TMC 18C30, 18C50 based SCSI host adapters. @@ -300,8 +298,8 @@ # The Rev 2 host cards use a 32K chunk, on a 32K boundary. # The cards can use an IRQ of 11, 12 or 15. -#X#device cy 1 -#X#options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared +#XXX#device cy 1 +#XXX#options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared device digi hint.digi.0.at="isa" hint.digi.0.port="0x104" @@ -452,37 +450,37 @@ #XXX these 32 bit binaries is added. # Enable iBCS2 runtime support for SCO and ISC binaries -#X#options IBCS2 +#XXX#options IBCS2 # Emulate spx device for client side of SVR3 local X interface -#X#options SPX_HACK +#XXX#options SPX_HACK # Enable Linux ABI emulation -#X#options COMPAT_LINUX +#XXX#options COMPAT_LINUX # Enable the linux-like proc filesystem support (requires COMPAT_LINUX # and PSEUDOFS) -#X#options LINPROCFS +#XXX#options LINPROCFS # # SysVR4 ABI emulation # # The svr4 ABI emulator can be statically compiled into the kernel or loaded as -# a KLD module. -# The STREAMS network emulation code can also be compiled statically or as a +# a KLD module. +# The STREAMS network emulation code can also be compiled statically or as a # module. If loaded as a module, it must be loaded before the svr4 module # (the /usr/sbin/svr4 script does this for you). If compiling statically, # the `streams' device must be configured into any kernel which also -# specifies COMPAT_SVR4. It is possible to have a statically-configured +# specifies COMPAT_SVR4. It is possible to have a statically-configured # STREAMS device and a dynamically loadable svr4 emulator; the /usr/sbin/svr4 # script understands that it doesn't need to load the `streams' module under # those circumstances. # Caveat: At this time, `options KTRACE' is required for the svr4 emulator -# (whether static or dynamic). +# (whether static or dynamic). # -#X#options COMPAT_SVR4 # build emulator statically -#X#options DEBUG_SVR4 # enable verbose debugging -#X#device streams # STREAMS network driver (required for svr4). +#XXX#options COMPAT_SVR4 # build emulator statically +#XXX#options DEBUG_SVR4 # enable verbose debugging +#XXX#device streams # STREAMS network driver (required for svr4). ##################################################################### @@ -501,8 +499,8 @@ options FB_INSTALL_CDEV # install a CDEV entry in /dev # PECOFF module (Win32 Execution Format) -#X#options PECOFF_SUPPORT # only knows 32 bit file format -#X#options PECOFF_DEBUG +#XXX#options PECOFF_SUPPORT # only knows 32 bit file format +#XXX#options PECOFF_DEBUG options ENABLE_ALART options KBDIO_DEBUG=2