diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml index 3138dde1bf..f0b1569432 100644 --- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml @@ -402,10 +402,8 @@ Joel Dahl - Updated for &os; 5.X by - + Updated for &os; 6.X by - The Configuration File @@ -428,7 +426,7 @@ For an exhaustive list of architecture dependent options and devices, see the NOTES - file in the same directory as GENERIC. For + file in the same directory as the GENERIC file. For architecture independent options, see /usr/src/sys/conf/NOTES. @@ -481,38 +479,6 @@ cpu I686_CPU /var/run/dmesg.boot file to view your boot messages. - - kernel options - cpu type - - Support for I386_CPU is still provided in the - source of &os;, but it is disabled by default in both -STABLE and - -CURRENT. This means that to install &os; with a 386-class cpu, you now - have the following options: - - - - Install an older &os; release and rebuild from source as - described in . - - - - Build the userland and kernel on a newer machine and install on - the 386 using the precompiled /usr/obj - files (see for details). - - - - Roll your own release of &os; which includes - I386_CPU support in the kernels of the - installation CD-ROM. - - - - The first of these options is probably the easiest of all, but you - will need a lot of disk space which, on a 386-class machine, may be - difficult to find. - kernel options ident @@ -544,15 +510,11 @@ cpu I686_CPU - #makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols + makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols - The normal build process of &os; does not include - debugging information when building the kernel and strips most - symbols after the resulting kernel is linked, to save some space - at the install location. If you are going to do tests of kernels - in the -CURRENT branch or develop changes of your own for the &os; - kernel, you might want to uncomment this line. It will enable the - use of the option which enables debugging + The normal build process of &os; includes + debugging information when building the kernel with the + the option, which enables debugging information when passed to &man.gcc.1;. The same can be accomplished by the &man.config.8; option, if you are using the traditional way for building your @@ -561,11 +523,13 @@ cpu I686_CPU options SCHED_4BSD # 4BSD scheduler - The traditional scheduler for &os;. Depending on your system's - workload, you may gain performance by using the new ULE scheduler for - &os; that has been designed specially for SMP, but works just fine on UP - systems too. If you wish to try it out, replace SCHED_4BSD - with SCHED_ULE in your configuration file. + The traditional and default system scheduler for &os;. Keep this. + + options PREEMPTION # Enable kernel thread preemption + + Allows threads that are in the kernel to be preempted + by higher priority threads. It helps with interactivity and + allows interrupt threads to run sooner rather than waiting. options INET # InterNETworking @@ -658,7 +622,7 @@ options NFS_ROOT # NFS usable as /, requires NFSCLIENT - options PROCFS # Process filesystem + options PROCFS # Process filesystem (requires PSEUDOFS) The process file system. This is a pretend file system mounted on /proc which allows @@ -667,13 +631,13 @@ options NFS_ROOT # NFS usable as /, requires NFSCLIENTPROCFS: installs will not mount this file - system by default. - In addition, 6.X-CURRENT kernels - making use of PROCFS must now also include - support for PSEUDOFS: + system by default. options PSEUDOFS # Pseudo-filesystem framework + 6.X kernels making use of PROCFS must also + include support for PSEUDOFS. + options GEOM_GPT # GUID Partition Tables. This option brings the ability to have a large number of @@ -693,12 +657,12 @@ options NFS_ROOT # NFS usable as /, requires NFSCLIENT - options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI + options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI - This causes the kernel to pause for 15 seconds before probing + This causes the kernel to pause for 5 seconds before probing each SCSI device in your system. If you only have IDE hard drives, - you can ignore this, otherwise you will probably want to lower this - number, perhaps to 5 seconds, to speed up booting. Of course, if + you can ignore this, otherwise you can try to lower this + number, to speed up booting. Of course, if you do this and &os; has trouble recognizing your SCSI devices, you will have to raise it again. @@ -774,15 +738,6 @@ options AHD_REG_PRETTY_PRINT # Print register bitfields in debug is required for SMP kernels. Add options SMP to include support for multiple processors. - device isa - - All PCs supported by &os; have one of these. Do not remove this, - even if you have no ISA slots. If you have an - IBM PS/2 (Micro Channel Architecture) system, &os; provides only - limited support at this time. For more information about the - MCA support, see - /usr/src/sys/i386/conf/NOTES. - device eisa Include this if you have an EISA motherboard. This enables @@ -844,6 +799,7 @@ device ahc # AHA2940 and onboard AIC7xxx devices device ahd # AHA39320/29320 and onboard AIC79xx devices device amd # AMD 53C974 (Teckram DC-390(T)) device isp # Qlogic family +#device ispfw # Firmware for QLogic HBAs- normally a module device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets) @@ -889,6 +845,7 @@ device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x +device rr232x # Highpoint RocketRAID 232x device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID device mly # Mylex AcceleRAID/eXtremeRAID @@ -898,6 +855,7 @@ device twa # 3ware 9000 series PATA/SATA RAID device aac # Adaptec FSA RAID device aacp # SCSI passthrough for aac (requires CAM) device ida # Compaq Smart RAID +device mfi # LSI MegaRAID SAS device mlx # Mylex DAC960 family device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID @@ -926,11 +884,15 @@ device atkbdc # AT keyboard controller Use this device if your mouse plugs into the PS/2 mouse port. + device kbdmux # keyboard multiplexer + + Basic support for keyboard multiplexing. + device vga # VGA video card driver The video card driver. - # splash screen/screen saver + device splash # Splash screen and screen saver support Splash screen at start up! Screen savers require this @@ -970,14 +932,6 @@ device sc will enable support for AGP, and AGP GART for boards which have these features. - # Floating point support - do not disable. -device npx - - npx is the interface to the floating point - math unit in &os;, which is either the hardware co-processor or - the software math emulator. This is not - optional. - APM @@ -1094,12 +1048,14 @@ device miibus # MII bus support including a generic one for PHYs that are not specifically handled by an individual driver. - device bfe # Broadcom BCM440x 10/100 Ethernet + device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet +device bfe # Broadcom BCM440x 10/100 Ethernet device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) device lge # Level 1 LXT1001 gigabit ethernet device nge # NatSemi DP83820 gigabit ethernet +device nve # nVidia nForce MCP on-board Ethernet Networking device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 @@ -1141,6 +1097,7 @@ of which cards are device wlan # 802.11 support device an # Aironet 4500/4800 802.11 wireless NICs. device awi # BayStack 660 and others +device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. #device wl # Older non 802.11 Wavelan wireless NIC. @@ -1154,16 +1111,6 @@ device loop # Network loopback role="ipaddr">127.0.0.1) it will come back at you through this device. This is mandatory. - device mem # Memory and kernel memory devices - - The system memory devices. - - device io # I/O device - - This option allows a process to gain I/O privileges. This is - useful in order to write userland programs that can handle hardware - directly. This is required to run the X Window system. - device random # Entropy device Cryptographically secure random number generator.