diff options
Diffstat (limited to 'sys/i386/conf')
-rw-r--r-- | sys/i386/conf/GENERIC | 5 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 6 | ||||
-rw-r--r-- | sys/i386/conf/PAE | 3 | ||||
-rw-r--r-- | sys/i386/conf/XEN | 4 | ||||
-rw-r--r-- | sys/i386/conf/XENHVM | 24 |
5 files changed, 41 insertions, 1 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 3c851fa..0db2bbf 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -61,6 +61,8 @@ options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. options KBD_INSTALL_CDEV # install a CDEV entry in /dev options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing +options CAPABILITY_MODE # Capsicum capability mode +options CAPABILITIES # Capsicum capabilities options MAC # TrustedBSD MAC Framework #options KDTRACE_HOOKS # Kernel DTrace hooks options INCLUDE_CONFIG_FILE # Include this file in kernel @@ -137,7 +139,8 @@ device da # Direct Access (disks) device sa # Sequential Access (tape etc) device cd # CD device pass # Passthrough device (direct ATA/SCSI access) -device ses # SCSI Environmental Services (and SAF-TE) +device ses # Enclosure Services (SES and SAF-TE) +device ctl # CAM Target Layer # RAID controllers interfaced to the SCSI subsystem device amr # AMI MegaRAID diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 8b69e45..0cd0080 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -706,6 +706,10 @@ device aacp # SCSI Passthrough interface (optional, CAM required) device asr # +# Highpoint RocketRAID 27xx. +device hpt27xx + +# # Highpoint RocketRAID 182x. device hptmv @@ -833,9 +837,11 @@ hint.pcf.0.irq="5" # # ichwd: Intel ICH watchdog timer # amdsbwd: AMD SB7xx watchdog timer +# viawd: VIA south bridge watchdog timer # device ichwd device amdsbwd +device viawd # # Temperature sensors: diff --git a/sys/i386/conf/PAE b/sys/i386/conf/PAE index 613b7d7..ebf010e 100644 --- a/sys/i386/conf/PAE +++ b/sys/i386/conf/PAE @@ -23,6 +23,7 @@ device ispfw # address properly may cause data corruption when used in a machine with more # than 4 gigabytes of memory. + nodevice ahb nodevice sym nodevice trm @@ -37,6 +38,8 @@ nodevice ncv nodevice nsp nodevice stg +nodevice ctl + nodevice asr nodevice dpt nodevice mly diff --git a/sys/i386/conf/XEN b/sys/i386/conf/XEN index ad453bf..61fdbb4 100644 --- a/sys/i386/conf/XEN +++ b/sys/i386/conf/XEN @@ -83,6 +83,10 @@ device md # Memory "disks" device gif # IPv6 and IPv4 tunneling device faith # IPv6-to-IPv4 relaying (translation) +# Wireless cards +options IEEE80211_SUPPORT_MESH +options AH_SUPPORT_AR5416 + # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! # Note that 'bpf' is required for DHCP. diff --git a/sys/i386/conf/XENHVM b/sys/i386/conf/XENHVM new file mode 100644 index 0000000..672716b --- /dev/null +++ b/sys/i386/conf/XENHVM @@ -0,0 +1,24 @@ +# +# XENHVM -- Xen HVM kernel configuration file for FreeBSD/i386 +# +# $FreeBSD$ +# +include GENERIC +ident XENHVM + +makeoptions MODULES_OVERRIDE="" + +# +# Adaptive locks rely on a lock-free pointer read to determine the run state +# of the thread holding a lock when under contention; under a virtualisation +# system, the thread run state may not accurately reflect whether the thread +# (or rather its host VCPU) is actually executing. As such, disable this +# optimisation. +# +options NO_ADAPTIVE_MUTEXES +options NO_ADAPTIVE_RWLOCKS +options NO_ADAPTIVE_SX + +# Xen HVM support +options XENHVM +device xenpci |