Sun Dec 18 02:31:51 2011 UTC ()
adjust English usage in comment


(dholland)
diff -r1.1058 -r1.1059 src/sys/arch/i386/conf/GENERIC
cvs diff -r1.1058 -r1.1059 src/sys/arch/i386/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/i386/conf/GENERIC 2011/11/22 21:25:19 1.1058
+++ src/sys/arch/i386/conf/GENERIC 2011/12/18 02:31:51 1.1059
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.1058 2011/11/22 21:25:19 tls Exp $ 1# $NetBSD: GENERIC,v 1.1059 2011/12/18 02:31:51 dholland Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/i386/conf/std.i386" 21include "arch/i386/conf/std.i386"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.1058 $" 25#ident "GENERIC-$Revision: 1.1059 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29# CPU-related options. 29# CPU-related options.
30options VM86 # virtual 8086 emulation 30options VM86 # virtual 8086 emulation
31options USER_LDT # user-settable LDT; used by WINE 31options USER_LDT # user-settable LDT; used by WINE
32#options PAE # PAE mode (36 bits physical addressing) 32#options PAE # PAE mode (36 bits physical addressing)
33 33
34# CPU features 34# CPU features
35acpicpu* at cpu? # ACPI CPU (including frequency scaling) 35acpicpu* at cpu? # ACPI CPU (including frequency scaling)
36coretemp* at cpu? # Intel on-die thermal sensor 36coretemp* at cpu? # Intel on-die thermal sensor
37est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI) 37est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI)
38#odcm0 at cpu0 # On-demand clock modulation 38#odcm0 at cpu0 # On-demand clock modulation
@@ -70,27 +70,27 @@ options MULTIBOOT # Multiboot support ( @@ -70,27 +70,27 @@ options MULTIBOOT # Multiboot support (
70# and can deal with holes in the memory layout. 70# and can deal with holes in the memory layout.
71#options PHYSMEM_MAX_SIZE=64 # max size of physical memory (in MB) 71#options PHYSMEM_MAX_SIZE=64 # max size of physical memory (in MB)
72#options PHYSMEM_MAX_ADDR=2048 # don't use memory above this (in MB) 72#options PHYSMEM_MAX_ADDR=2048 # don't use memory above this (in MB)
73 73
74# Standard system options 74# Standard system options
75 75
76options INSECURE # disable kernel security levels - X needs this 76options INSECURE # disable kernel security levels - X needs this
77 77
78options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 78options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
79options NTP # NTP phase/frequency locked loop 79options NTP # NTP phase/frequency locked loop
80 80
81options KTRACE # system call tracing via ktrace(1) 81options KTRACE # system call tracing via ktrace(1)
82 82
83# Note: SysV IPC parameters could be changed dynamically, see sysctl(8). 83# Note: SysV IPC parameters can be changed dynamically; see sysctl(8).
84options SYSVMSG # System V-like message queues 84options SYSVMSG # System V-like message queues
85options SYSVSEM # System V-like semaphores 85options SYSVSEM # System V-like semaphores
86options SYSVSHM # System V-like memory sharing 86options SYSVSHM # System V-like memory sharing
87options P1003_1B_SEMAPHORE # p1003.1b semaphore support 87options P1003_1B_SEMAPHORE # p1003.1b semaphore support
88 88
89options MODULAR # new style module(7) framework 89options MODULAR # new style module(7) framework
90 90
91options USERCONF # userconf(4) support 91options USERCONF # userconf(4) support
92#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 92#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
93options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel 93options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
94 94
95# Beep when it is safe to power down the system (requires sysbeep) 95# Beep when it is safe to power down the system (requires sysbeep)
96#options BEEP_ONHALT 96#options BEEP_ONHALT