Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge in 1.787

This commit is contained in:
christos 2006-10-13 21:00:51 +00:00
parent 1339a7549f
commit 1dc96a7bd3
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/arch/i386/conf/ALL
View File

@ -1,5 +1,5 @@
# $NetBSD: ALL,v 1.65 2006/10/08 16:56:18 rpaulo Exp $
# From: NetBSD: GENERIC,v 1.776 2006/08/14 09:34:43 itohy Exp
# $NetBSD: ALL,v 1.66 2006/10/13 21:00:51 christos Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
#
@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "ALL-$Revision: 1.65 $"
#ident "ALL-$Revision: 1.66 $"
maxusers 32 # estimated number of users
@ -190,7 +190,7 @@ options INET6 # IPV6
options IPSEC # IP security
options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
options IPSEC_DEBUG # debug for IP security
options MROUTING # IP multicast routing
options PIM # Protocol Independent Multicast
options ISO,TPIP # OSI
@ -203,7 +203,7 @@ options PFIL_HOOKS # pfil(9) packet filter hooks
options IPFILTER_LOG # ipmon(8) log support
options IPFILTER_LOOKUP # ippool(8) support
options IPFILTER_DEFAULT_BLOCK # block all packets by default
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
@ -247,6 +247,7 @@ options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
options WSDISPLAY_COMPAT_USL # VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
options WSKBD_EVENT_AUTOREPEAT # auto repeat in event mode
#options WSKBD_USONLY # strip off non-US keymaps
# don't attach pckbd as the console if no PS/2 keyboard is found
options PCKBD_CNATTACH_MAY_FAIL
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
@ -297,6 +298,9 @@ p64h2apic* at pci? dev? function? # P64H2 IOxAPIC
# Basic Bus Support
#IPMI support
ipmi0 at mainbus?
# Advanced Configuration and Power Interface
# This option can be used to retrieve CPU and APIC information.
@ -1387,3 +1391,4 @@ options VERIFIED_EXEC_FP_SHA512
options VERIFIED_EXEC_FP_SHA1
options VERIFIED_EXEC_FP_MD5
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions