Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/conf/GENERIC,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.1118.2.8 retrieving revision 1.1119 diff -u -p -r1.1118.2.8 -r1.1119 --- src/sys/arch/i386/conf/GENERIC 2016/05/29 08:44:17 1.1118.2.8 +++ src/sys/arch/i386/conf/GENERIC 2015/02/13 18:57:47 1.1119 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1118.2.8 2016/05/29 08:44:17 skrll Exp $ +# $NetBSD: GENERIC,v 1.1119 2015/02/13 18:57:47 nonaka Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1118.2.8 $" +#ident "GENERIC-$Revision: 1.1119 $" maxusers 64 # estimated number of users @@ -112,6 +112,7 @@ options DIAGNOSTIC # inexpensive kernel # XXX to be commented out on release branch #options DEBUG # expensive debugging checks/support #options LOCKDEBUG # expensive locking checks/support +#options KMEMSTATS # kernel memory statistics (vmstat -m) options DDB # in-kernel debugger #options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic' options DDB_HISTORY_SIZE=512 # enable history editing in DDB @@ -122,7 +123,7 @@ options DDB_HISTORY_SIZE=512 # enable h #options SYSCALL_STATS # per syscall counts #options SYSCALL_TIMES # per syscall times #options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris) -options KDTRACE_HOOKS # kernel DTrace hooks +#options KDTRACE_HOOKS # kernel DTrace hooks # Compatibility options options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI @@ -148,7 +149,7 @@ options COMPAT_OSSAUDIO # OSS (Voxware) options COMPAT_SVR4 # binary compatibility with SVR4 options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux -#options COMPAT_FREEBSD # binary compatibility with FreeBSD +options COMPAT_FREEBSD # binary compatibility with FreeBSD #options COMPAT_NDIS # NDIS network driver options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. @@ -374,7 +375,6 @@ thinkpad* at acpi? # IBM/Lenovo Thinkpa #tpm* at acpi? # ACPI TPM (Experimental) ug* at acpi? # Abit uGuru Hardware monitor vald* at acpi? # Toshiba Libretto hotkeys -valz* at acpi? # Toshiba Dynabook hotkeys wb* at acpi? # Winbond W83L518D SD/MMC reader sdmmc* at wb? # SD/MMC bus wmidell* at acpiwmibus? # Dell WMI mappings @@ -451,10 +451,9 @@ amdtemp* at amdnb_misc? # AMD CPU Temp #amdpcib* at pci? dev ? function ? # AMD 8111 PCI-ISA w/ HPET #hpet* at amdpcib? ichlpcib* at pci? dev ? function ? # Intel ICH PCI-LPC w/ timecounter, - # watchdog, gpio, SpeedStep and HPET + # watchdog, SpeedStep and HPET fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator #hpet* at ichlpcib? -tco* at ichlpcib? # TCO watchdog timer tcpcib* at pci? dev ? function ? # Intel Atom E6xx PCI-LPC hpet* at tcpcib? gcscpcib* at pci? dev ? function ? # AMD CS5535/CS5536 PCI-ISA w/ @@ -538,15 +537,14 @@ pms* at pckbc? # PS/2 mouse for wsmous #options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads -# vga@isa and pcdisplay@isa are disabled; see PR#49290 -#vga0 at isa? +vga0 at isa? vga* at pci? dev ? function ? -#pcdisplay0 at isa? # CGA, MDA, EGA, HGA +pcdisplay0 at isa? # CGA, MDA, EGA, HGA genfb* at pci? dev ? function ? options VCONS_DRAW_INTR #machfb* at pci? dev ? function ? # ATI Mach64 framebuffer driver wsdisplay* at vga? console ? -#wsdisplay* at pcdisplay? console ? +wsdisplay* at pcdisplay? console ? wsdisplay* at wsemuldisplaydev? #wsdisplay* at machfb? console ? wskbd* at pckbd? console ? @@ -571,18 +569,14 @@ sysbeep0 at pcppi? #tdfxdrm* at drm? # 3dfx (voodoo) DRM driver #viadrm* at drm? # VIA DRM driver -# DRMKMS drivers i915drmkms* at pci? dev ? function ? intelfb* at intelfbbus? radeon* at pci? dev ? function ? radeondrmkmsfb* at radeonfbbus? -nouveau* at pci? dev ? function ? -nouveaufb* at nouveaufbbus? - -# DRMUMS drivers -#viadrmums* at drm? +#nouveau* at pci? dev ? function ? +#nouveaufb* at nouveaufbbus # Serial Devices @@ -654,10 +648,6 @@ iic* at alipm? ichsmb* at pci? dev ? function ? iic* at ichsmb? -# Intel S1200,C2000 (non-pch) SMBus controller -ismt* at pci? dev ? function ? -iic* at ismt? - # NVIDIA nForce2/3/4 SMBus controller nfsmbc* at pci? dev ? function ? nfsmb* at nfsmbc? @@ -1005,7 +995,6 @@ ral* at pci? dev ? function ? # Ralink T re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S rtk* at pci? dev ? function ? # Realtek 8129/8139 rtw* at pci? dev ? function ? # Realtek 8180L (802.11) -rtwn* at pci? dev ? function ? # Realtek 8188CE/8192CE 802.11b/g/n sf* at pci? dev ? function ? # Adaptec AIC-6915 Ethernet sip* at pci? dev ? function ? # SiS 900/DP83815 Ethernet skc* at pci? dev ? function ? # SysKonnect SK9821 Gigabit Ethernet @@ -1149,7 +1138,7 @@ urlphy* at mii? phy ? # Realtek RTL815 # USB Controller and Devices # PCI USB controllers -xhci* at pci? dev ? function ? # eXtensible Host Controller +# xhci* at pci? dev ? function ? # eXtensible Host Controller # xhci is at best experimental ehci* at pci? dev ? function ? # Enhanced Host Controller gcscehci* at pci? dev ? function ? # Enhanced Host Controller (Geode CSC) @@ -1168,7 +1157,7 @@ uhci* at cardbus? function ? # Universa slhci* at pcmcia? function ? # ScanLogic SL811HS # USB bus support -usb* at xhci? +# usb* at xhci? usb* at ehci? usb* at gcscehci? usb* at ohci? @@ -1321,7 +1310,7 @@ ukyopon* at uhub? port ? ucom* at ukyopon? portno ? # USB scanners -#uscanner* at uhub? port ? +uscanner* at uhub? port ? # USB scanners that use SCSI emulation, e.g., HP5300 usscanner* at uhub? port ? @@ -1713,8 +1702,5 @@ options VERIFIED_EXEC_FP_SHA512 options VERIFIED_EXEC_FP_SHA1 options VERIFIED_EXEC_FP_MD5 -options PAX_ASLR_DEBUG=1 # PaX ASLR debug -options PAX_SEGVGUARD=0 # PaX Segmentation fault guard -options PAX_MPROTECT=1 # PaX mprotect(2) restrictions -options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug -options PAX_ASLR=1 # PaX Address Space Layout Randomization +options PAX_MPROTECT=0 # PaX mprotect(2) restrictions +options PAX_ASLR=0 # PaX Address Space Layout Randomization