CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: gdt Date: Fri Mar 5 20:30:56 UTC 2021 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: XEN3_DOM0: Approach GENERIC When processed to remove comments, blank lines, normalize whitespace, and sort/uniq (one line was previously duplicated), this file is identical to the previous version. It has been reorganized to reduce diffs to GENERIC, and many missing lines from GENERIC have been added but commented out. To generate a diff of this commit: cvs rdiff -u -r1.191 -r1.192 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.191 src/sys/arch/amd64/conf/XEN3_DOM0:1.192 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.191 Thu Mar 4 16:02:10 2021 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Fri Mar 5 20:30:56 2021 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.191 2021/03/04 16:02:10 gdt Exp $ +# $NetBSD: XEN3_DOM0,v 1.192 2021/03/05 20:30:56 gdt Exp $ # XEN3_DOM0 machine description file # @@ -14,7 +14,7 @@ include "arch/amd64/conf/std.xen" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "XEN3_DOM0-$Revision: 1.191 $" +#ident "XEN3_DOM0-$Revision: 1.192 $" maxusers 32 # estimated number of users @@ -43,9 +43,20 @@ maxusers 32 # estimated number of users #options PHYSMEM_MAX_SIZE=64 # max size of physical memory (in MB) #options PHYSMEM_MAX_ADDR=2048 # don't use memory above this (in MB) +## Replace std.amd64 content + +mainbus0 at root +cpu* at mainbus? +ioapic* at mainbus? apid ? + +# Atheros HAL options +include "external/isc/atheros_hal/conf/std.ath_hal" + +## end std.amd64 + ## Xen-specific options -options XENPV # PV dom0 support +options XENPV # PV dom0 support options DOM0OPS options MULTIPROCESSOR #options NO_PREEMPTION # needed if MULTIPROCESSOR is disabled @@ -58,10 +69,6 @@ options MULTIPROCESSOR # boot messages with MPBIOS, acpi and ioapic can be quite large options MSGBUFSIZE=24576 -# CPU features -est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI) -powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI) - # Standard system options options INSECURE # disable kernel security levels - X needs this @@ -79,10 +86,20 @@ options SYSVSEM # System V-like semaph options SYSVSHM # System V-like memory sharing options MODULAR # new style module(7) framework +#options MODULAR_DEFAULT_AUTOLOAD options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel +# CPU features +#acpicpu* at cpu? # ACPI CPU (including frequency scaling) +#coretemp* at cpu? # Intel on-die thermal sensor +est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI) +#hyperv0 at cpu0 # Microsoft Hyper-V +#odcm0 at cpu0 # On-demand clock modulation +powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI) +#vmt0 at cpu0 # VMware Tools + # Alternate buffer queue strategies for better responsiveness under high # disk I/O load. #options BUFQ_READPRIO @@ -286,10 +303,6 @@ config netbsd root on ? type ? # ## Xen-specific options -mainbus0 at root - -cpu* at mainbus? - hypervisor* at mainbus? # Xen hypervisor vcpu* at hypervisor? # Xen virtual CPUs @@ -306,8 +319,8 @@ ipmi_acpi* at acpi? ipmi0 at ipmi_acpi? # ACPI will be used if present. If not it will fall back to MPBIOS -acpi0 at hypervisor? # ACPI access in PV mode acpi0 at mainbus? # ACPI access in PVH(VM) mode +acpi0 at hypervisor? # ACPI access in PV mode options ACPI_SCANPCI # find PCI roots using ACPI options MPBIOS # configure CPUs and APICs using MPBIOS @@ -322,8 +335,6 @@ options MPBIOS_SCANPCI # MPBIOS config #options MPDEBUG # MPBIOS configures PCI roots #options MPVERBOSE # verbose MPBIOS autoconfig messages -ioapic* at mainbus? apid ? - # ACPI devices acpiacad* at acpi? # ACPI AC Adapter acpibat* at acpi? # ACPI Battery @@ -343,30 +354,44 @@ acpitz* at acpi? # ACPI Thermal Zone # Mainboard devices aibs* at acpi? # ASUSTeK AI Booster hardware monitor +#asus* at acpi? # ASUS hotkeys +#attimer* at acpi? # AT Timer #com* at acpi? # Serial communications interface #fdc* at acpi? # Floppy disk controller +#fujbp* at acpi? # Fujitsu Brightness & Pointer +#fujhk* at acpi? # Fujitsu Hotkeys #hpacel* at acpi? # HP 3D DriveGuard accelerometer -#hpqlb* at acpi? # HP Quick Launch Buttons hpqlb* at acpi? # HP Quick Launch Buttons +#hpet* at acpihpetbus? # High Precision Event Timer (table) +#hpet* at acpinodebus? # High Precision Event Timer (device) +#joy* at acpi? # Joystick/Game port +#lpt* at acpi? # Parallel port +#mpu* at acpi? # Roland MPU-401 MIDI UART #lpt* at acpi? # Parallel port pckbc* at acpi? # PC keyboard controller pcppi* at
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: gdt Date: Fri Mar 5 20:18:39 UTC 2021 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: GENERIC: comment typo fix (spacing) To generate a diff of this commit: cvs rdiff -u -r1.585 -r1.586 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.585 src/sys/arch/amd64/conf/GENERIC:1.586 --- src/sys/arch/amd64/conf/GENERIC:1.585 Thu Mar 4 15:58:50 2021 +++ src/sys/arch/amd64/conf/GENERIC Fri Mar 5 20:18:39 2021 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.585 2021/03/04 15:58:50 gdt Exp $ +# $NetBSD: GENERIC,v 1.586 2021/03/05 20:18:39 gdt Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.585 $" +#ident "GENERIC-$Revision: 1.586 $" maxusers 64 # estimated number of users @@ -1133,7 +1133,7 @@ pseudo-device ccd # concatenated/strip pseudo-device cgd # cryptographic disk devices pseudo-device raid # RAIDframe disk driver options RAID_AUTOCONFIG # auto-configuration of RAID components -#Options to enable various other RAIDframe RAID types. +# Options to enable various other RAIDframe RAID types. #options RF_INCLUDE_EVENODD=1 #options RF_INCLUDE_RAID5_RS=1 #options RF_INCLUDE_PARITYLOGGING=1
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: gdt Date: Thu Mar 4 19:01:41 UTC 2021 Modified Files: src/sys/arch/amd64/conf: std.xen Log Message: std.xen: Move towards std.amd64 (No functional change.) To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/amd64/conf/std.xen Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/std.xen diff -u src/sys/arch/amd64/conf/std.xen:1.13 src/sys/arch/amd64/conf/std.xen:1.14 --- src/sys/arch/amd64/conf/std.xen:1.13 Sat Apr 25 15:26:16 2020 +++ src/sys/arch/amd64/conf/std.xen Thu Mar 4 19:01:41 2021 @@ -1,20 +1,20 @@ -# $NetBSD: std.xen,v 1.13 2020/04/25 15:26:16 bouyer Exp $ -# NetBSD: std.i386,v 1.24 2003/02/26 21:33:36 fvdl Exp +# $NetBSD: std.xen,v 1.14 2021/03/04 19:01:41 gdt Exp $ # -# standard, required NetBSD/i386 'options' +# standard, required NetBSD/xen 'options' +# Note that this file is used by both DOM0 and DOMU. machine xen amd64 x86 include "conf/std" # MI standard options -include "arch/xen/conf/files.xen.pv" - -options XEN #Xen support - -include "arch/xen/conf/std.xenversion" +include "arch/xen/conf/std.xenversion" options CPU_IN_CKSUM options EXEC_ELF64 # exec ELF binaries options EXEC_SCRIPT # exec #! scripts options MTRR +#options MULTIPROCESSOR options CHILD_MAX=1024 # 160 is too few options OPEN_MAX=1024 # 128 is too few + +options XEN # Xen support +include "arch/xen/conf/files.xen.pv"
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: gdt Date: Thu Mar 4 16:02:11 UTC 2021 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: XEN3_DOM0: Move closer to GENERIC (NFC) This is another step in making XEN3_DOM0 closer to GENERIC. It is just reordering lines, adding commented out lines, and adding a few comments. (Test-booted with no dmesg change.) This pass is showing cases where there are substantive and likely undesired changes (e.g., UFS_ACL is not defined in XEN3_DOM0). Often I added them but commented them out to preserve the NFC property of this commit. My plan is to finish the easy NFC stuff first before addressing functional changes. To generate a diff of this commit: cvs rdiff -u -r1.190 -r1.191 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.190 src/sys/arch/amd64/conf/XEN3_DOM0:1.191 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.190 Wed Mar 3 12:31:19 2021 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Thu Mar 4 16:02:10 2021 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.190 2021/03/03 12:31:19 gdt Exp $ +# $NetBSD: XEN3_DOM0,v 1.191 2021/03/04 16:02:10 gdt Exp $ # XEN3_DOM0 machine description file # @@ -14,7 +14,7 @@ include "arch/amd64/conf/std.xen" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "XEN3_DOM0-$Revision: 1.190 $" +#ident "XEN3_DOM0-$Revision: 1.191 $" maxusers 32 # estimated number of users @@ -80,6 +80,7 @@ options SYSVSHM # System V-like memory options MODULAR # new style module(7) framework options USERCONF # userconf(4) support +#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel # Alternate buffer queue strategies for better responsiveness under high @@ -108,9 +109,55 @@ 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 + +# Kernel Undefined Behavior Sanitizer (kUBSan). +#options KUBSAN # mandatory +#options UBSAN_ALWAYS_FATAL # optional: panic on all kUBSan reports + +# Kernel Address Sanitizer (kASan). You need to disable SVS to use it. +# The quarantine is optional and can help KASAN find more use-after-frees. +# Use KASAN_PANIC if you want panics instead of warnings. +#makeoptions KASAN=1 # mandatory +#options KASAN # mandatory +#no options SVS # mandatory +#options POOL_QUARANTINE # optional +#options KASAN_PANIC # optional + +# Kernel Concurrency Sanitizer (kCSan). +#makeoptions KCSAN=1 # mandatory +#options KCSAN # mandatory +#options KCSAN_PANIC # optional + +# Kernel Memory Sanitizer (kMSan). You need to disable SVS and kernel modules +# to use it. POOL_NOCACHE is optional and can help KMSAN find uninitialized +# memory in pool caches. Note that KMSAN requires at least 4GB of RAM. +#makeoptions KMSAN=1 # mandatory +#options KMSAN # mandatory +#no options SVS # mandatory +#no options MODULAR # mandatory +#no options MODULAR_DEFAULT_AUTOLOAD # mandatory +#options POOL_NOCACHE # optional +#options KMSAN_PANIC # optional + +# Kernel Code Coverage Driver. +#makeoptions KCOV=1 +#options KCOV + +# Fault Injection Driver. +#options FAULT # Compatibility options +# x86_64 never shipped with a.out binaries; the two options below are +# only relevant to 32-bit i386 binaries +#options EXEC_AOUT # required by binaries from before 1.5 +#options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI + +# NetBSD backward compatibility. Support goes from COMPAT_15 up until +# the latest release. Note that really old compat (< COMPAT_16) is only +# useful for 32-bit i386 binaries. include "conf/compat_netbsd15.config" + #options COMPAT_386BSD_MBRPART # recognize old partition ID options COMPAT_NETBSD32 @@ -128,17 +175,23 @@ options DKWEDGE_METHOD_APPLE # Support include "conf/filesystems.config" # File system options +# ffs options QUOTA # legacy UFS quotas options QUOTA2 # new, in-filesystem UFS quotas -#options DISKLABEL_EI # disklabel Endian Independent support #options FFS_EI # FFS Endian Independent support options WAPBL # File system journaling support +# Note that UFS_DIRHASH is suspected of causing kernel memory corruption. +# It is not recommended for general use. #options UFS_DIRHASH # UFS Large Directory Hashing - Experimental -options NFSSERVER # Network File System server +#options UFS_ACL # UFS Access Control Lists #options FFS_NO_SNAPSHOT # No FFS snapshot support options UFS_EXTATTR # Extended attribute support for UFS1 +# ext2fs #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and # immutable) behave as system flags. +# other +#options DISKLABEL_EI
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: gdt Date: Thu Mar 4 15:58:50 UTC 2021 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: GENERIC: Tiny comment adjustment (NFC) While making XEN3_DOM0 more like GENERIC, I noticed a few differences where GENERIC was off -- trivial things like missing spaces in comments, inconsistent comment workding. This fixes those, both because they are valid fixes in their own right once noticed, and to make the diff to XEN smaller. To generate a diff of this commit: cvs rdiff -u -r1.584 -r1.585 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.584 src/sys/arch/amd64/conf/GENERIC:1.585 --- src/sys/arch/amd64/conf/GENERIC:1.584 Mon Mar 1 18:12:58 2021 +++ src/sys/arch/amd64/conf/GENERIC Thu Mar 4 15:58:50 2021 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.584 2021/03/01 18:12:58 jakllsch Exp $ +# $NetBSD: GENERIC,v 1.585 2021/03/04 15:58:50 gdt Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.584 $" +#ident "GENERIC-$Revision: 1.585 $" maxusers 64 # estimated number of users @@ -297,7 +297,7 @@ config netbsd root on ? type ? # Device configuration # -#IPMI support +# IPMI support ipmi0 at mainbus? ipmi_acpi* at acpi? ipmi0 at ipmi_acpi? @@ -307,7 +307,7 @@ acpi0 at mainbus0 options ACPI_SCANPCI # find PCI roots using ACPI options MPBIOS # configure CPUs and APICs using MPBIOS options MPBIOS_SCANPCI # MPBIOS configures PCI roots -#options PCI_INTR_FIXUP # PCI interrupt routing via ACPI +#options PCI_INTR_FIXUP # fixup PCI interrupt routing via ACPI #options PCI_BUS_FIXUP # fixup PCI bus numbering #options PCI_ADDR_FIXUP # fixup PCI I/O addresses #options ACPI_ACTIVATE_DEV # If set, activate inactive devices @@ -317,7 +317,7 @@ options VGA_POST # in-kernel support f acpiacad* at acpi? # ACPI AC Adapter acpibat* at acpi? # ACPI Battery acpibut* at acpi? # ACPI Button -acpidalb* at acpi? # Direct Application Launch Button +acpidalb* at acpi? # ACPI Direct Application Launch Button acpiec* at acpi? # ACPI Embedded Controller (late) acpiecdt* at acpi? # ACPI Embedded Controller (early) acpifan* at acpi? # ACPI Fan
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: gdt Date: Wed Mar 3 12:31:19 UTC 2021 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: XEN3_DOM0: Move closer to GENERIC (NFC) This commit reorders some lines, and brings in commented lines from GENERIC to reduce the diff. It also brings in two agp lines, commented out, and with a warning that they are intentionally omitted. To generate a diff of this commit: cvs rdiff -u -r1.189 -r1.190 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.189 src/sys/arch/amd64/conf/XEN3_DOM0:1.190 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.189 Tue Mar 2 18:10:31 2021 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Wed Mar 3 12:31:19 2021 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.189 2021/03/02 18:10:31 gdt Exp $ +# $NetBSD: XEN3_DOM0,v 1.190 2021/03/03 12:31:19 gdt Exp $ # XEN3_DOM0 machine description file # @@ -12,22 +12,48 @@ include "arch/amd64/conf/std.xen" -options XENPV # PV dom0 support -options MULTIPROCESSOR -#options NO_PREEMPTION # needed if MULTIPROCESSOR is disabled - options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#options UVMHIST -#options UVMHIST_PRINT -#options SYSCALL_DEBUG - -#ident "XEN3_DOM0-$Revision: 1.189 $" +#ident "XEN3_DOM0-$Revision: 1.190 $" maxusers 32 # estimated number of users -# +# delay between "rebooting ..." message and hardware reset, in milliseconds +#options CPURESET_DELAY=2000 + +# This option allows you to force a serial console at the specified +# I/O address. see console(4) for details. +#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600 +# you don't want the option below ON iff you are using the +# serial console option of the new boot strap code. +#options CONS_OVERRIDE # Always use above! independent of boot info + +# The following options override the memory sizes passed in from the boot +# block. Use them *only* if the boot block is unable to determine the correct +# values. Note that the BIOS may *correctly* report less than 640k of base +# memory if the extended BIOS data area is located at the top of base memory +# (as is the case on most recent systems). +#options REALBASEMEM=639 # size of base memory (in KB) +#options REALEXTMEM=15360 # size of extended memory (in KB) + +# The following options limit the overall size of physical memory +# and/or the maximum address used by the system. +# Contrary to REALBASEMEM and REALEXTMEM, they still use the BIOS memory map +# and can deal with holes in the memory layout. +#options PHYSMEM_MAX_SIZE=64 # max size of physical memory (in MB) +#options PHYSMEM_MAX_ADDR=2048 # don't use memory above this (in MB) + +## Xen-specific options + +options XENPV # PV dom0 support options DOM0OPS +options MULTIPROCESSOR +#options NO_PREEMPTION # needed if MULTIPROCESSOR is disabled + +#options CONSDEVNAME="\"xencons\"" +#options CONS_OVERRIDE + +## end Xen-specific options # boot messages with MPBIOS, acpi and ioapic can be quite large options MSGBUFSIZE=24576 @@ -36,10 +62,7 @@ options MSGBUFSIZE=24576 est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI) powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI) -#options MTRR # memory-type range register syscall support - -#options CONSDEVNAME="\"xencons\"" -#options CONS_OVERRIDE +# Standard system options options INSECURE # disable kernel security levels - X needs this @@ -50,6 +73,7 @@ options KTRACE # system call tracing v options CPU_UCODE # cpu ucode loading support +# Note: SysV IPC parameters could be changed dynamically, see sysctl(8). options SYSVMSG # System V-like message queues options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing @@ -65,15 +89,25 @@ options BUFQ_PRIOCSCAN # Diagnostic/debugging support options options DIAGNOSTIC # inexpensive kernel consistency checks +# XXX to be commented out on release branch #options DEBUG # expensive debugging checks/support +#options LOCKDEBUG # expensive locking checks/support + +# +# Because gcc omits the frame pointer for any -O level, the line below +# is needed to make backtraces in DDB work. +# +makeoptions COPTS="-O2 -fno-omit-frame-pointer" options DDB # in-kernel debugger +options DDB_COMMANDONENTER="show registers" options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic' options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600 #makeoptions DEBUG="-g" # compile full symbol table -makeoptions COPTS="-O2 -fno-omit-frame-pointer" -options DDB_COMMANDONENTER="show registers" +#options SYSCALL_STATS # per syscall counts +#options SYSCALL_TIMES # per syscall times +#options
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: gdt Date: Tue Mar 2 18:10:31 UTC 2021 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: XEN3_DOM0: Fix pckbc console attachment logic Copy PCKBD_CNATTACH_MAY_FAIL lines from GENERIC to XEN3_DOM0. GENERIC defines PCKBD_CNATTACH_MAY_FAIL, which means that an attempt to activate console input on pckbc will fail if there is no keyboard present. This is a problem on semi-modern machines that have pckbc silicon but not ports, and thus almost always have a USB keyboard also. What I suspect are bugs in console attachment logic lead to attempting to attach a ukbd while there already is a console keyboard, and with DIAGNOSTIC this is (properly) fatal, so XEN3_DOM0 blows up with a USB keyboard in current, and probably not in 9. Live tested on a machine that previously paniced on boot. To generate a diff of this commit: cvs rdiff -u -r1.188 -r1.189 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.188 src/sys/arch/amd64/conf/XEN3_DOM0:1.189 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.188 Tue Mar 2 18:06:12 2021 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Tue Mar 2 18:10:31 2021 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.188 2021/03/02 18:06:12 gdt Exp $ +# $NetBSD: XEN3_DOM0,v 1.189 2021/03/02 18:10:31 gdt Exp $ # XEN3_DOM0 machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.188 $" +#ident "XEN3_DOM0-$Revision: 1.189 $" maxusers 32 # estimated number of users @@ -166,6 +166,8 @@ options WSDISPLAY_COMPAT_PCVT # emulat options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls options WSDISPLAY_COMPAT_USL # wsconscfg VT handling options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes +# 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 #options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" # allocate a number of virtual screens at autoconfiguration time
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: gdt Date: Tue Mar 2 18:06:12 UTC 2021 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: XEN3_DOM0: Sync VERBOSE with GENERIC Copy the *VERBOSE option block from GENERIC, and prune the scattered verbose options in XEN3_DOM0, surely dating from a time they were copied from an earlier GENERIC. This amounts to adding PCIVERBOSE and SCSIVERBOSE, and the diff from GENERIC to DOM0 boots is markedly reduced. To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.187 src/sys/arch/amd64/conf/XEN3_DOM0:1.188 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.187 Mon Mar 1 13:52:50 2021 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Tue Mar 2 18:06:12 2021 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.187 2021/03/01 13:52:50 gdt Exp $ +# $NetBSD: XEN3_DOM0,v 1.188 2021/03/02 18:06:12 gdt Exp $ # XEN3_DOM0 machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.187 $" +#ident "XEN3_DOM0-$Revision: 1.188 $" maxusers 32 # estimated number of users @@ -133,6 +133,17 @@ options PPP_FILTER # Active filter supp #options ALTQ_RIO # RED with IN/OUT #options ALTQ_WFQ # Weighted Fair Queueing +# These options enable verbose messages for several subsystems. +# Warning, these may compile large string tables into the kernel! +#options ACPIVERBOSE # verbose ACPI configuration messages +#options MIIVERBOSE # verbose PHY autoconfig messages +options PCIVERBOSE # verbose PCI device autoconfig messages +#options PCI_CONFIG_DUMP # verbosely dump PCI config space +#options PCMCIAVERBOSE # verbose PCMCIA configuration messages +options SCSIVERBOSE # human readable SCSI error messages +#options USBVERBOSE # verbose USB device autoconfig messages +#options HDAUDIOVERBOSE # verbose HDAUDIO driver messages + options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM #options NFS_BOOT_BOOTSTATIC #options NFS_BOOTSTATIC_MYIP="\"169.254.1.2\"" @@ -197,8 +208,6 @@ acpi0 at mainbus? # ACPI access in PVH #options ACPI_ACTIVATE_DEV # If set, activate inactive devices options ACPI_SCANPCI # find PCI roots using ACPI #options ACPICA_PEDANTIC # force strict conformance to the Spec. -#options ACPIVERBOSE # verbose ACPI configuration messages -#options MIIVERBOSE # verbose PHY autoconfig messages options MPBIOS # configure CPUs and APICs using MPBIOS #options MPDEBUG # MPBIOS configures PCI roots #options MPVERBOSE # verbose MPBIOS autoconfig messages @@ -206,9 +215,6 @@ options MPBIOS_SCANPCI # MPBIOS config #options PCI_ADDR_FIXUP # fixup PCI I/O addresses #options PCI_BUS_FIXUP # fixup PCI bus numbering #options PCI_INTR_FIXUP # fixup PCI interrupt routing -#options PCIVERBOSE # verbose PCI device autoconfig messages -#options USBVERBOSE # verbose USB device autoconfig messages -#options HDAUDIOVERBOSE # verbose HDAUDIO driver messages ioapic* at mainbus? apid ?
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: gdt Date: Mon Mar 1 13:52:50 UTC 2021 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: amd64/conf/XEN3_DOM0: Add comment This commit merely adds a comment explaining how XEN3_DOM0 ought to relate to GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.186 -r1.187 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.186 src/sys/arch/amd64/conf/XEN3_DOM0:1.187 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.186 Wed Jan 20 13:22:08 2021 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Mon Mar 1 13:52:50 2021 @@ -1,4 +1,14 @@ -# $NetBSD: XEN3_DOM0,v 1.186 2021/01/20 13:22:08 nia Exp $ +# $NetBSD: XEN3_DOM0,v 1.187 2021/03/01 13:52:50 gdt Exp $ + +# XEN3_DOM0 machine description file +# +# This machine description file is used to generate a kernel to be +# used as a PV dom0 under Xen. It is similar to GENERIC in that it is +# intended to be useful for most applications. Generally, besides +# changes that are specifically required for Xen (e.g., XENPV), it +# should be similar to GENERIC. Some differences are currently +# necessary, such as drivers that fail under Xen but work in GENERIC, +# for reasons that do not follow from Xen architecture. include "arch/amd64/conf/std.xen" @@ -12,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.186 $" +#ident "XEN3_DOM0-$Revision: 1.187 $" maxusers 32 # estimated number of users
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: pgoyette Date: Wed Jan 20 21:38:44 UTC 2021 Modified Files: src/sys/arch/amd64/conf: NOCOMPAT Log Message: COMPAT_OSSAUDIO no longer exists; remove dangling reference To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amd64/conf/NOCOMPAT Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/NOCOMPAT diff -u src/sys/arch/amd64/conf/NOCOMPAT:1.5 src/sys/arch/amd64/conf/NOCOMPAT:1.6 --- src/sys/arch/amd64/conf/NOCOMPAT:1.5 Sun Aug 16 10:27:47 2020 +++ src/sys/arch/amd64/conf/NOCOMPAT Wed Jan 20 21:38:44 2021 @@ -1,6 +1,6 @@ include "arch/amd64/conf/GENERIC" -#ident "NOCOMPAT-$Revision: 1.5 $" +#ident "NOCOMPAT-$Revision: 1.6 $" no options SYSVMSG # System V-like message queues no options SYSVSEM # System V-like semaphores @@ -31,6 +31,5 @@ no options COMPAT_15 #no options COMPAT_80 #no options COMPAT_90 -no options COMPAT_OSSAUDIO no options COMPAT_NETBSD32 no options EXEC_ELF32 # requires COMPAT_NETBSD32
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: thorpej Date: Sat Jan 16 01:43:42 UTC 2021 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Enable tpm @ acpi (now that it can match TPM 1.2 devices, which are not, as the comment implies, experimental). To generate a diff of this commit: cvs rdiff -u -r1.580 -r1.581 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.580 src/sys/arch/amd64/conf/GENERIC:1.581 --- src/sys/arch/amd64/conf/GENERIC:1.580 Sun Sep 27 13:48:49 2020 +++ src/sys/arch/amd64/conf/GENERIC Sat Jan 16 01:43:42 2021 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.580 2020/09/27 13:48:49 roy Exp $ +# $NetBSD: GENERIC,v 1.581 2021/01/16 01:43:42 thorpej Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.580 $" +#ident "GENERIC-$Revision: 1.581 $" maxusers 64 # estimated number of users @@ -354,7 +354,7 @@ sony* at acpi? # Sony Notebook Control spic* at acpi? # Sony Programmable I/O Controller wsmouse* at spic? # mouse thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys -#tpm* at acpi? # ACPI TPM (Experimental) +tpm* at acpi? # ACPI TPM (Experimental) ug* at acpi? # Abit uGuru Hardware monitor valz* at acpi? # Toshiba Dynabook hotkeys wb* at acpi? # Winbond W83L518D SD/MMC reader
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: martin Date: Sun Dec 13 08:23:52 UTC 2020 Modified Files: src/sys/arch/amd64/conf: ALL Log Message: Add atppc* at acpi? To generate a diff of this commit: cvs rdiff -u -r1.164 -r1.165 src/sys/arch/amd64/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.164 src/sys/arch/amd64/conf/ALL:1.165 --- src/sys/arch/amd64/conf/ALL:1.164 Sun Sep 27 13:48:49 2020 +++ src/sys/arch/amd64/conf/ALL Sun Dec 13 08:23:52 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.164 2020/09/27 13:48:49 roy Exp $ +# $NetBSD: ALL,v 1.165 2020/12/13 08:23:52 martin 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.164 $" +#ident "ALL-$Revision: 1.165 $" maxusers 64 # estimated number of users @@ -377,6 +377,7 @@ aibs* at acpi? # ASUSTeK AI Booster ha applesmc* at acpi? # Apple System Management Controller asus* at acpi? # ASUS hotkeys attimer* at acpi? # AT Timer +atppc* at acpi? # AT-style parallel port com* at acpi? # Serial communications interface fdc* at acpi? # Floppy disk controller fujbp* at acpi? # Fujitsu Brightness & Pointer
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: dholland Date: Sun Aug 30 11:16:17 UTC 2020 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: typo in comment To generate a diff of this commit: cvs rdiff -u -r1.577 -r1.578 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.577 src/sys/arch/amd64/conf/GENERIC:1.578 --- src/sys/arch/amd64/conf/GENERIC:1.577 Mon Aug 17 20:43:13 2020 +++ src/sys/arch/amd64/conf/GENERIC Sun Aug 30 11:16:17 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.577 2020/08/17 20:43:13 christos Exp $ +# $NetBSD: GENERIC,v 1.578 2020/08/30 11:16:17 dholland Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.577 $" +#ident "GENERIC-$Revision: 1.578 $" maxusers 64 # estimated number of users @@ -78,7 +78,7 @@ options USER_LDT # User-settable LDT, u options SVS # Separate Virtual Space options PCPU_IDT # Per CPU IDTs -# GCC Spectre variant 2 migitation +# GCC Spectre variant 2 mitigation makeoptions SPECTRE_V2_GCC_MITIGATION=1 options SPECTRE_V2_GCC_MITIGATION
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: riastradh Date: Thu Aug 20 21:36:11 UTC 2020 Modified Files: src/sys/arch/amd64/conf: ALL Log Message: Add wg(4) to amd64/ALL. To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.161 src/sys/arch/amd64/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.160 src/sys/arch/amd64/conf/ALL:1.161 --- src/sys/arch/amd64/conf/ALL:1.160 Sat Aug 1 12:28:19 2020 +++ src/sys/arch/amd64/conf/ALL Thu Aug 20 21:36:11 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.160 2020/08/01 12:28:19 jdolecek Exp $ +# $NetBSD: ALL,v 1.161 2020/08/20 21:36:11 riastradh 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.160 $" +#ident "ALL-$Revision: 1.161 $" maxusers 64 # estimated number of users @@ -1641,6 +1641,7 @@ pseudo-device npf # NPF packet filter pseudo-device kttcp # srt is EXPERIMENTAL pseudo-device srt # source-address-based routing +pseudo-device wg # WireGuard pseudo-device canloop # CAN loopback interface
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Mon Aug 17 20:43:13 UTC 2020 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: remove commented out MEMORY_DISK_* entries To generate a diff of this commit: cvs rdiff -u -r1.576 -r1.577 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.576 src/sys/arch/amd64/conf/GENERIC:1.577 --- src/sys/arch/amd64/conf/GENERIC:1.576 Mon Aug 17 15:41:32 2020 +++ src/sys/arch/amd64/conf/GENERIC Mon Aug 17 16:43:13 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.576 2020/08/17 19:41:32 christos Exp $ +# $NetBSD: GENERIC,v 1.577 2020/08/17 20:43:13 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.576 $" +#ident "GENERIC-$Revision: 1.577 $" maxusers 64 # estimated number of users @@ -1143,9 +1143,7 @@ pseudo-device fss # file system snapsh pseudo-device md # memory disk device (ramdisk) options MEMORY_DISK_HOOKS # enable md specific hooks -#options MEMORY_DISK_IS_ROOT # enable root ramdisk options MEMORY_DISK_DYNAMIC # enable dynamic resizing -#options MEMORY_DISK_SERVER # enable userland server hooks pseudo-device vnd # disk-like interface to files options VND_COMPRESSION # compressed vnd(4)
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Mon Aug 17 19:41:32 UTC 2020 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: correct MEMORY_DISK_* option docs To generate a diff of this commit: cvs rdiff -u -r1.575 -r1.576 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.575 src/sys/arch/amd64/conf/GENERIC:1.576 --- src/sys/arch/amd64/conf/GENERIC:1.575 Sun Aug 16 06:27:47 2020 +++ src/sys/arch/amd64/conf/GENERIC Mon Aug 17 15:41:32 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.575 2020/08/16 10:27:47 jdolecek Exp $ +# $NetBSD: GENERIC,v 1.576 2020/08/17 19:41:32 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.575 $" +#ident "GENERIC-$Revision: 1.576 $" maxusers 64 # estimated number of users @@ -1142,8 +1142,10 @@ options RAID_AUTOCONFIG # auto-configu pseudo-device fss # file system snapshot device pseudo-device md # memory disk device (ramdisk) -options MEMORY_DISK_HOOKS # enable root ramdisk -options MEMORY_DISK_DYNAMIC # loaded via kernel module(7) +options MEMORY_DISK_HOOKS # enable md specific hooks +#options MEMORY_DISK_IS_ROOT # enable root ramdisk +options MEMORY_DISK_DYNAMIC # enable dynamic resizing +#options MEMORY_DISK_SERVER # enable userland server hooks pseudo-device vnd # disk-like interface to files options VND_COMPRESSION # compressed vnd(4)
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: jdolecek Date: Sat Aug 1 12:28:19 UTC 2020 Modified Files: src/sys/arch/amd64/conf: ALL Log Message: remove CISS_NO_INTERRUPT_HACK from ALL kernel config too, it's no longer supported in ciss(4) To generate a diff of this commit: cvs rdiff -u -r1.159 -r1.160 src/sys/arch/amd64/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.159 src/sys/arch/amd64/conf/ALL:1.160 --- src/sys/arch/amd64/conf/ALL:1.159 Sat Aug 1 08:20:47 2020 +++ src/sys/arch/amd64/conf/ALL Sat Aug 1 12:28:19 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.159 2020/08/01 08:20:47 maxv Exp $ +# $NetBSD: ALL,v 1.160 2020/08/01 12:28:19 jdolecek 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.159 $" +#ident "ALL-$Revision: 1.160 $" maxusers 64 # estimated number of users @@ -831,7 +831,6 @@ amr* at pci? dev ? function ? # AMI/LSI arcmsr* at pci? dev ? function ? # Areca SATA RAID controllers cac* at pci? dev ? function ? # Compaq PCI array controllers ciss* at pci? dev ? function ? # HP Smart Array controllers -options CISS_NO_INTERRUPT_HACK icp* at pci? dev ? function ? # ICP-Vortex GDT & Intel RAID ips* at pci? dev ? function ? # Adaptec/IBM ServeRAID
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: yamaguchi Date: Tue Jul 14 01:05:07 UTC 2020 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Enable PCPU_IDT option by default To generate a diff of this commit: cvs rdiff -u -r1.571 -r1.572 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.571 src/sys/arch/amd64/conf/GENERIC:1.572 --- src/sys/arch/amd64/conf/GENERIC:1.571 Wed Jun 24 03:38:54 2020 +++ src/sys/arch/amd64/conf/GENERIC Tue Jul 14 01:05:06 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.571 2020/06/24 03:38:54 thorpej Exp $ +# $NetBSD: GENERIC,v 1.572 2020/07/14 01:05:06 yamaguchi Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.571 $" +#ident "GENERIC-$Revision: 1.572 $" maxusers 64 # estimated number of users @@ -76,6 +76,7 @@ options SYSCTL_INCLUDE_DESCR # Include # CPU-related options #options USER_LDT # User-settable LDT, used by Wine options SVS # Separate Virtual Space +options PCPU_IDT # Per CPU IDTs # GCC Spectre variant 2 migitation makeoptions SPECTRE_V2_GCC_MITIGATION=1
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: thorpej Date: Wed Jun 24 03:38:55 UTC 2020 Modified Files: src/sys/arch/amd64/conf: ALL GENERIC Log Message: Add amdccp at pci. To generate a diff of this commit: cvs rdiff -u -r1.153 -r1.154 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.570 -r1.571 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.153 src/sys/arch/amd64/conf/ALL:1.154 --- src/sys/arch/amd64/conf/ALL:1.153 Sun Jun 7 09:45:19 2020 +++ src/sys/arch/amd64/conf/ALL Wed Jun 24 03:38:54 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.153 2020/06/07 09:45:19 maxv Exp $ +# $NetBSD: ALL,v 1.154 2020/06/24 03:38:54 thorpej 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.153 $" +#ident "ALL-$Revision: 1.154 $" maxusers 64 # estimated number of users @@ -1539,6 +1539,7 @@ btsco* at bthub? # Cryptographic Devices # PCI cryptographic devices +amdccp* at pci? dev ? function ? # AMD Cryptographic Coprocessor hifn* at pci? dev ? function ? # Hifn 7755/7811/795x qat* at pci? dev ? function ? # Intel QuickAssist ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.570 src/sys/arch/amd64/conf/GENERIC:1.571 --- src/sys/arch/amd64/conf/GENERIC:1.570 Thu Jun 18 16:23:43 2020 +++ src/sys/arch/amd64/conf/GENERIC Wed Jun 24 03:38:54 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.570 2020/06/18 16:23:43 maxv Exp $ +# $NetBSD: GENERIC,v 1.571 2020/06/24 03:38:54 thorpej Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.570 $" +#ident "GENERIC-$Revision: 1.571 $" maxusers 64 # estimated number of users @@ -461,6 +461,7 @@ nouveaufb* at nouveaufbbus? # Cryptographic Devices # PCI cryptographic devices +amdccp* at pci? dev ? function ? # AMD Cryptographic Coprocessor hifn* at pci? dev ? function ? # Hifn 7755/7811/795x #qat* at pci? dev ? function ? # Intel QuickAssist ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maxv Date: Thu Jun 18 16:23:43 UTC 2020 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: style To generate a diff of this commit: cvs rdiff -u -r1.569 -r1.570 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.569 src/sys/arch/amd64/conf/GENERIC:1.570 --- src/sys/arch/amd64/conf/GENERIC:1.569 Sun Jun 7 09:45:19 2020 +++ src/sys/arch/amd64/conf/GENERIC Thu Jun 18 16:23:43 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.569 2020/06/07 09:45:19 maxv Exp $ +# $NetBSD: GENERIC,v 1.570 2020/06/18 16:23:43 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.569 $" +#ident "GENERIC-$Revision: 1.570 $" maxusers 64 # estimated number of users @@ -76,8 +76,9 @@ options SYSCTL_INCLUDE_DESCR # Include # CPU-related options #options USER_LDT # User-settable LDT, used by Wine options SVS # Separate Virtual Space -makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2 - # migitation + +# GCC Spectre variant 2 migitation +makeoptions SPECTRE_V2_GCC_MITIGATION=1 options SPECTRE_V2_GCC_MITIGATION # CPU features @@ -122,13 +123,15 @@ options DDB_HISTORY_SIZE=512 # enable h #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 makeoptions DEBUG="-g" # compile full symbol table for CTF options DDB_COMMANDONENTER="trace;show registers" -#options KUBSAN # Kernel Undefined Behavior Sanitizer (kUBSan) -#options UBSAN_ALWAYS_FATAL # (optional) Panic on all kUBSan reports #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 +# Kernel Undefined Behavior Sanitizer (kUBSan). +#options KUBSAN # mandatory +#options UBSAN_ALWAYS_FATAL # optional: panic on all kUBSan reports + # Kernel Address Sanitizer (kASan). You need to disable SVS to use it. # The quarantine is optional and can help KASAN find more use-after-frees. # Use KASAN_PANIC if you want panics instead of warnings.
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: jdolecek Date: Sat May 30 13:35:31 UTC 2020 Modified Files: src/sys/arch/amd64/conf: ALL Log Message: add bwfm* at pci?, which is present in GENERIC To generate a diff of this commit: cvs rdiff -u -r1.151 -r1.152 src/sys/arch/amd64/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.151 src/sys/arch/amd64/conf/ALL:1.152 --- src/sys/arch/amd64/conf/ALL:1.151 Mon May 25 07:20:14 2020 +++ src/sys/arch/amd64/conf/ALL Sat May 30 13:35:31 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.151 2020/05/25 07:20:14 yamaguchi Exp $ +# $NetBSD: ALL,v 1.152 2020/05/30 13:35:31 jdolecek 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.151 $" +#ident "ALL-$Revision: 1.152 $" maxusers 64 # estimated number of users @@ -964,6 +964,7 @@ bce* at pci? dev ? function ? # Broadcom bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless +bwfm* at pci? dev ? function ? # Broadcom FullMAC cas* at pci? dev ? function ? # Sun Cassini/Cassini+ Ethernet dge* at pci? dev ? function ? # Intel 82597 10GbE LR ena* at pci? dev ? function ? # Amazon Elastic Network Adapter
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: jdolecek
Date: Thu May 21 09:36:24 UTC 2020
Modified Files:
src/sys/arch/amd64/conf: kern.ldscript.Xen
Log Message:
update Xen ldscript to add kASan .ctors section, so that Xen kernel with
enabled KASAN option at least compiles; no promises on it actually working
though
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amd64/conf/kern.ldscript.Xen
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/kern.ldscript.Xen
diff -u src/sys/arch/amd64/conf/kern.ldscript.Xen:1.16 src/sys/arch/amd64/conf/kern.ldscript.Xen:1.17
--- src/sys/arch/amd64/conf/kern.ldscript.Xen:1.16 Sun Jun 24 18:24:53 2018
+++ src/sys/arch/amd64/conf/kern.ldscript.Xen Thu May 21 09:36:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.16 2018/06/24 18:24:53 maxv Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.17 2020/05/21 09:36:24 jdolecek Exp $ */
#include "assym.h"
@@ -32,6 +32,10 @@ SECTIONS
{
*(.rodata)
*(.rodata.*)
+ . = ALIGN(COHERENCY_UNIT);
+ __CTOR_LIST__ = .;
+ *(.ctors)
+ __CTOR_END__ = .;
}
. = ALIGN(__PAGE_SIZE);
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: simonb Date: Sat Apr 25 12:41:58 UTC 2020 Modified Files: src/sys/arch/amd64/conf: ALL Log Message: Add uxrcom. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/sys/arch/amd64/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.148 src/sys/arch/amd64/conf/ALL:1.149 --- src/sys/arch/amd64/conf/ALL:1.148 Mon Apr 13 09:30:42 2020 +++ src/sys/arch/amd64/conf/ALL Sat Apr 25 12:41:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.148 2020/04/13 09:30:42 jdolecek Exp $ +# $NetBSD: ALL,v 1.149 2020/04/25 12:41:57 simonb 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.148 $" +#ident "ALL-$Revision: 1.149 $" maxusers 64 # estimated number of users @@ -1289,6 +1289,9 @@ ucom* at uark? portno ? umcs* at uhub? port ? # Moschip MCS7xxx serial adapter ucom* at umcs? portno ? +uxrcom* at uhub? port ? # Exar XR21V141x serial adapter +ucom* at uxrcom? portno ? + uhmodem* at uhub? ucom* at uhmodem? portno ?
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: jdolecek Date: Mon Apr 13 09:30:42 UTC 2020 Modified Files: src/sys/arch/amd64/conf: ALL Log Message: remove wd* at umass?, it was dropped To generate a diff of this commit: cvs rdiff -u -r1.147 -r1.148 src/sys/arch/amd64/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.147 src/sys/arch/amd64/conf/ALL:1.148 --- src/sys/arch/amd64/conf/ALL:1.147 Wed Mar 25 17:06:17 2020 +++ src/sys/arch/amd64/conf/ALL Mon Apr 13 09:30:42 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.147 2020/03/25 17:06:17 jdolecek Exp $ +# $NetBSD: ALL,v 1.148 2020/04/13 09:30:42 jdolecek 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.147 $" +#ident "ALL-$Revision: 1.148 $" maxusers 64 # estimated number of users @@ -1198,7 +1198,6 @@ uhso* at uhub? port ? configuration ? # USB Mass Storage umass* at uhub? port ? configuration ? interface ? -wd* at umass? # USB audio uaudio* at uhub? port ? configuration ?
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: maxv
Date: Mon Apr 13 09:34:03 UTC 2020
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
Log Message:
Make KASAN compatible with LLVM. Same as GCC, except that LLVM aggressively
inlines the shadow checks, and this causes problems at boot time; so we
pass -asan-instrumentation-with-call-threshold=0 to force callbacks instead
of inlines.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/amd64/conf/Makefile.amd64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.82 src/sys/arch/amd64/conf/Makefile.amd64:1.83
--- src/sys/arch/amd64/conf/Makefile.amd64:1.82 Sat Apr 4 07:03:57 2020
+++ src/sys/arch/amd64/conf/Makefile.amd64 Mon Apr 13 09:34:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.82 2020/04/04 07:03:57 maxv Exp $
+# $NetBSD: Makefile.amd64,v 1.83 2020/04/13 09:34:02 maxv Exp $
# Makefile for NetBSD
#
@@ -49,12 +49,21 @@ CFLAGS+= -mindirect-branch=thunk-in
CFLAGS+= -mindirect-branch-register
.endif
-.if ${KASAN:U0} > 0 && ${HAVE_GCC:U0} > 0
+.if ${KASAN:U0} > 0
+.if ${HAVE_GCC:U0} > 0
KASANFLAGS= -fsanitize=kernel-address \
--param asan-globals=1 --param asan-stack=1 \
--param asan-instrument-allocas=1 \
-fsanitize-address-use-after-scope \
-fasan-shadow-offset=0xDFFF9000
+.elif ${HAVE_LLVM:Uno} == "yes"
+KASANFLAGS= -fsanitize=kernel-address \
+ -mllvm -asan-globals=1 -mllvm -asan-stack=1 \
+ -mllvm -asan-instrument-dynamic-allocas=1 \
+ -mllvm -asan-use-after-scope=1 \
+ -mllvm -asan-instrumentation-with-call-threshold=0 \
+ -mllvm -asan-mapping-offset=0xDFFF9000
+.endif
.for f in subr_asan.c subr_kcov.c
KASANFLAGS.${f}= # empty
.endfor
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: nia Date: Fri Jan 24 18:58:46 UTC 2020 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Set AUDIO_BLK_MS=4 - unlikely to cause significant overhead on non-m68k. Several of us have been setting this in /etc/sysctl.conf for months, to get better performance from applications that require synced audio, etc. It's also mentioned as a good value with low overhead on most archs here: https://mail-index.netbsd.org/tech-kern/2019/12/07/msg025830.html We could probably go lower, but this is low enough to make most/all software run well, removing frame drops. It's also low enough to get emulators/mednafen to stop complaining in the console. To generate a diff of this commit: cvs rdiff -u -r1.558 -r1.559 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.558 src/sys/arch/amd64/conf/GENERIC:1.559 --- src/sys/arch/amd64/conf/GENERIC:1.558 Mon Jan 20 18:38:19 2020 +++ src/sys/arch/amd64/conf/GENERIC Fri Jan 24 18:58:46 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.558 2020/01/20 18:38:19 thorpej Exp $ +# $NetBSD: GENERIC,v 1.559 2020/01/24 18:58:46 nia Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.558 $" +#ident "GENERIC-$Revision: 1.559 $" maxusers 64 # estimated number of users @@ -55,6 +55,9 @@ maxusers 64 # estimated number of users options INSECURE # disable kernel security levels - X needs this +options AUDIO_BLK_MS=4 # make software with low latency needs performant +# no substantial CPU overhead on this platform + options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT options NTP # NTP phase/frequency locked loop
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: pgoyette Date: Tue Dec 31 15:07:22 UTC 2019 Modified Files: src/sys/arch/amd64/conf: MODULAR Log Message: Update to not include COMPAT_90 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amd64/conf/MODULAR Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/MODULAR diff -u src/sys/arch/amd64/conf/MODULAR:1.12 src/sys/arch/amd64/conf/MODULAR:1.13 --- src/sys/arch/amd64/conf/MODULAR:1.12 Mon Jun 17 03:31:57 2019 +++ src/sys/arch/amd64/conf/MODULAR Tue Dec 31 15:07:22 2019 @@ -1,4 +1,4 @@ -# $NetBSD: MODULAR,v 1.12 2019/06/17 03:31:57 christos Exp $ +# $NetBSD: MODULAR,v 1.13 2019/12/31 15:07:22 pgoyette Exp $ # # Try to exclude all the drivers in GENERIC that have been modularized # XXX: incomplete @@ -22,8 +22,9 @@ options MODULAR_DEFAULT_AUTOLOAD -no options COMPAT_40 # NetBSD 4.0, -no options COMPAT_50 # NetBSD 5.0, -no options COMPAT_60 # NetBSD 6.0, --no options COMPAT_70 # NetBSD 7.0, and --no options COMPAT_80 # NetBSD 8.0 binary compatibility. +-no options COMPAT_70 # NetBSD 7.0, +-no options COMPAT_80 # NetBSD 8.0, and +-no options COMPAT_90 # NetBSD 9.0 binary compatibility. -no options COMPAT_43 # and 4.3BSD #options COMPAT_386BSD_MBRPART # recognize old partition ID
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: msaitoh Date: Thu Dec 26 17:52:49 UTC 2019 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add cas(4). To generate a diff of this commit: cvs rdiff -u -r1.551 -r1.552 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.551 src/sys/arch/amd64/conf/GENERIC:1.552 --- src/sys/arch/amd64/conf/GENERIC:1.551 Sat Dec 14 07:45:20 2019 +++ src/sys/arch/amd64/conf/GENERIC Thu Dec 26 17:52:49 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.551 2019/12/14 07:45:20 maxv Exp $ +# $NetBSD: GENERIC,v 1.552 2019/12/26 17:52:49 msaitoh Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.551 $" +#ident "GENERIC-$Revision: 1.552 $" maxusers 64 # estimated number of users @@ -788,6 +788,7 @@ bge* at pci? dev ? function ? # Broadcom bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless bwfm* at pci? dev ? function ? # Broadcom FullMAC +cas* at pci? dev ? function ? # Sun Cassini/Cassini+ Ethernet dge* at pci? dev ? function ? # Intel 82597 10GbE LR ena* at pci? dev ? function ? # Amazon.com Elastic Network Adapter ep* at pci? dev ? function ? # 3Com 3c59x
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maxv Date: Sat Dec 14 07:45:20 UTC 2019 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Disable multiboot for now, too much breakage. To generate a diff of this commit: cvs rdiff -u -r1.550 -r1.551 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.550 src/sys/arch/amd64/conf/GENERIC:1.551 --- src/sys/arch/amd64/conf/GENERIC:1.550 Tue Dec 10 12:08:52 2019 +++ src/sys/arch/amd64/conf/GENERIC Sat Dec 14 07:45:20 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.550 2019/12/10 12:08:52 yamaguchi Exp $ +# $NetBSD: GENERIC,v 1.551 2019/12/14 07:45:20 maxv Exp $ # # GENERIC machine description file # @@ -22,11 +22,11 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.550 $" +#ident "GENERIC-$Revision: 1.551 $" maxusers 64 # estimated number of users -options MULTIBOOT # Multiboot support (see multiboot(8)) +#options MULTIBOOT # Multiboot support (see multiboot(8)) # delay between "rebooting ..." message and hardware reset, in milliseconds #options CPURESET_DELAY=2000
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: manu
Date: Wed Dec 11 02:31:45 UTC 2019
Modified Files:
src/sys/arch/amd64/conf: kern.ldscript
Log Message:
Rollback kernel link scrpt change for multiboot
The multiboot section breaks BIOS boot. Rolling back the link script
removes the section, which breaks multiboot but should restore BIOS boot.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amd64/conf/kern.ldscript
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/kern.ldscript
diff -u src/sys/arch/amd64/conf/kern.ldscript:1.28 src/sys/arch/amd64/conf/kern.ldscript:1.29
--- src/sys/arch/amd64/conf/kern.ldscript:1.28 Tue Dec 10 02:06:07 2019
+++ src/sys/arch/amd64/conf/kern.ldscript Wed Dec 11 02:31:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.28 2019/12/10 02:06:07 manu Exp $ */
+/* $NetBSD: kern.ldscript,v 1.29 2019/12/11 02:31:44 manu Exp $ */
#include "assym.h"
@@ -13,13 +13,9 @@ __LARGE_PAGE_SIZE = 0x20 ;
ENTRY(_start)
SECTIONS
{
- multiboot 0x4000 :
- {
- KEEP(*(multiboot));
- }
.text : AT (ADDR(.text) & 0x0fff)
{
- . = ALIGN(__LARGE_PAGE_SIZE);
+ . = ALIGN(__PAGE_SIZE);
__text_user_start = . ;
*(.text.user)
. = ALIGN(__PAGE_SIZE);
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: msaitoh Date: Thu Apr 25 03:53:11 UTC 2019 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add gem(4). To generate a diff of this commit: cvs rdiff -u -r1.524 -r1.525 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.524 src/sys/arch/amd64/conf/GENERIC:1.525 --- src/sys/arch/amd64/conf/GENERIC:1.524 Thu Apr 18 17:13:00 2019 +++ src/sys/arch/amd64/conf/GENERIC Thu Apr 25 03:53:11 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.524 2019/04/18 17:13:00 maya Exp $ +# $NetBSD: GENERIC,v 1.525 2019/04/25 03:53:11 msaitoh Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.524 $" +#ident "GENERIC-$Revision: 1.525 $" maxusers 64 # estimated number of users @@ -798,6 +798,7 @@ et* at pci? dev ? function ? # Agere/LSI ex* at pci? dev ? function ? # 3Com 90x[BC] fpa* at pci? dev ? function ? # DEC DEFPA FDDI fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B +gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maya Date: Thu Apr 18 17:13:00 UTC 2019 Modified Files: src/sys/arch/amd64/conf: GENERIC INSTALL Log Message: Follow arm64 and provide two sizes of fonts, so a larger one is chosen for larger displays. To generate a diff of this commit: cvs rdiff -u -r1.523 -r1.524 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.94 -r1.95 src/sys/arch/amd64/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.523 src/sys/arch/amd64/conf/GENERIC:1.524 --- src/sys/arch/amd64/conf/GENERIC:1.523 Thu Apr 18 16:46:11 2019 +++ src/sys/arch/amd64/conf/GENERIC Thu Apr 18 17:13:00 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.523 2019/04/18 16:46:11 christos Exp $ +# $NetBSD: GENERIC,v 1.524 2019/04/18 17:13:00 maya Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.523 $" +#ident "GENERIC-$Revision: 1.524 $" maxusers 64 # estimated number of users @@ -1185,6 +1185,9 @@ pseudo-device nsmb # experimental - SM # wscons pseudo-devices pseudo-device wsmux # mouse & keyboard multiplexor pseudo-device wsfont +# Give us a choice of fonts based on monitor size +options FONT_BOLD8x16 +options FONT_BOLD16x32 # pseudo audio device driver pseudo-device pad Index: src/sys/arch/amd64/conf/INSTALL diff -u src/sys/arch/amd64/conf/INSTALL:1.94 src/sys/arch/amd64/conf/INSTALL:1.95 --- src/sys/arch/amd64/conf/INSTALL:1.94 Tue Dec 11 16:52:49 2018 +++ src/sys/arch/amd64/conf/INSTALL Thu Apr 18 17:13:00 2019 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.94 2018/12/11 16:52:49 maya Exp $ +# $NetBSD: INSTALL,v 1.95 2019/04/18 17:13:00 maya Exp $ # # INSTALL - Installation kernel. # @@ -8,9 +8,11 @@ include "arch/amd64/conf/GENERIC" options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=115200 -#ident "INSTALL-$Revision: 1.94 $" +#ident "INSTALL-$Revision: 1.95 $" no options MEMORY_DISK_DYNAMIC +no options FONT_BOLD16x32 +no options FONT_BOLD8x16 options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk support options MEMORY_DISK_ROOT_SIZE=1 # size of memory disk, in blocks
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Thu Apr 18 16:46:11 UTC 2019 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Yes, we support FFS_EI but not DISKLABEL_EI... How does that make sense? To generate a diff of this commit: cvs rdiff -u -r1.522 -r1.523 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.522 src/sys/arch/amd64/conf/GENERIC:1.523 --- src/sys/arch/amd64/conf/GENERIC:1.522 Sat Apr 13 04:41:37 2019 +++ src/sys/arch/amd64/conf/GENERIC Thu Apr 18 12:46:11 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.522 2019/04/13 08:41:37 maxv Exp $ +# $NetBSD: GENERIC,v 1.523 2019/04/18 16:46:11 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.522 $" +#ident "GENERIC-$Revision: 1.523 $" maxusers 64 # estimated number of users @@ -204,7 +204,7 @@ options UFS_EXTATTR # Extended attribut #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and # immutable) behave as system flags. # other -#options DISKLABEL_EI # disklabel Endian Independent support +options DISKLABEL_EI # disklabel Endian Independent support options NFSSERVER # Network File System server # Networking options
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: nonaka Date: Fri Mar 1 12:25:09 UTC 2019 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: fix typo. pointed out by pgoyette@n.o. To generate a diff of this commit: cvs rdiff -u -r1.519 -r1.520 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.519 src/sys/arch/amd64/conf/GENERIC:1.520 --- src/sys/arch/amd64/conf/GENERIC:1.519 Fri Mar 1 11:06:55 2019 +++ src/sys/arch/amd64/conf/GENERIC Fri Mar 1 12:25:09 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.519 2019/03/01 11:06:55 pgoyette Exp $ +# $NetBSD: GENERIC,v 1.520 2019/03/01 12:25:09 nonaka Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.519 $" +#ident "GENERIC-$Revision: 1.520 $" maxusers 64 # estimated number of users @@ -1090,7 +1090,7 @@ vmbus* at acpi? # Hyper-V VMBus hvn* at vmbus? # Hyper-V NetVSC hvs* at vmbus? # Hyper-V StorVSC hvheartbeat* at vmbus? # Hyper-V Heartbeat Service -hvshutdown* at vmbus? # Hyper-V Geust Shutdown Service +hvshutdown* at vmbus? # Hyper-V Guest Shutdown Service hvtimesync* at vmbus? # Hyper-V Time Synchronization Service #hvkvp* at vmbus? # Hyper-V Data Exchange Service
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: kamil Date: Sun Feb 24 20:58:55 UTC 2019 Modified Files: src/sys/arch/amd64/conf: ALL Log Message: Enable kUBSan kASan and KCOV in NetBSD/amd64 kernel=ALL Add disabled KLEAK as it conflicts right now with KCOV, using the same compiler instrumentation. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/arch/amd64/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.115 src/sys/arch/amd64/conf/ALL:1.116 --- src/sys/arch/amd64/conf/ALL:1.115 Wed Feb 6 11:58:30 2019 +++ src/sys/arch/amd64/conf/ALL Sun Feb 24 20:58:55 2019 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.115 2019/02/06 11:58:30 rin Exp $ +# $NetBSD: ALL,v 1.116 2019/02/24 20:58:55 kamil 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.115 $" +#ident "ALL-$Revision: 1.116 $" maxusers 64 # estimated number of users @@ -120,6 +120,7 @@ options KGDB # remote debugger options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 makeoptions COPTS="-O2 -fno-omit-frame-pointer" makeoptions DEBUG="-g" # compile full symbol table +options KUBSAN # Kernel Undefined Behavior Sanitizer (kUBSan) options SYSCALL_STATS # per syscall counts options SYSCALL_TIMES # per syscall times options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris) @@ -127,6 +128,19 @@ options KDTRACE_HOOKS # kernel DTrace h options UVMHIST # kernhist for uvm subsystem options BIOHIST # kernhist for buff I/O +# Kernel Address Sanitizer (kASan). You need to disable SVS to use it. +makeoptions KASAN=1 # Kernel Address Sanitizer +options KASAN +#no options SVS + +# Kernel Info Leak Detector. +#makeoptions KLEAK=1 +#options KLEAK + +# Kernel Code Coverage Driver. +makeoptions KCOV=1 +options KCOV + # Compatibility options options EXEC_AOUT # required by binaries from before 1.5 options COMPAT_386BSD_MBRPART # recognize old partition ID
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: cherry Date: Sat Feb 2 15:13:54 UTC 2019 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: Re-enable ixg(4) on NetBSD/xen dom0 Namespace conflicts have been resolved. Note that driver still has an incorrect us of __asm() gnu primitives via #if __FreeBSD_version < 80 ... #endif Since __FreeBSD_version is undefined and thus equates to 0 and thus satisfies the inequality. Needs fixing by driver maintainer. To generate a diff of this commit: cvs rdiff -u -r1.163 -r1.164 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.163 src/sys/arch/amd64/conf/XEN3_DOM0:1.164 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.163 Sat Feb 2 12:05:09 2019 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Feb 2 15:13:54 2019 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.163 2019/02/02 12:05:09 cherry Exp $ +# $NetBSD: XEN3_DOM0,v 1.164 2019/02/02 15:13:54 cherry Exp $ include "arch/amd64/conf/std.xen" @@ -10,7 +10,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.163 $" +#ident "XEN3_DOM0-$Revision: 1.164 $" maxusers 32 # estimated number of users @@ -371,7 +371,7 @@ ipw* at pci? dev ? function ? # Intel PR iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN iwm* at pci? dev ? function ? # Intel Wireless WiFi Link 7xxx -#ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit +ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit jme* at pci? dev ? function ? # JMicron JMC2[56]0 ethernet le* at pci? dev ? function ? # PCnet-PCI Ethernet lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: cherry Date: Sat Feb 2 12:05:09 UTC 2019 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: Summary: Disable ixg(4) until the linuxist mb() API re-definition within the XEN amd64 dom0 build is resolved. Detail: The xen public headers >= 0x00030201 depend on a linuxism - a memory barrier "API" namely mb(), rmb() and wmb(). These are made accessible to NetBSD code via the interface sys/external/bsd/common/include/asm/barrier.h Currently the ixg(4) driver uses an identical API by defining them (incorrectly) to inline assembler macro definitions in sys/dev/pci/ixgbe/ixgbe_osdep.h This will result in the dom0 builds failing to build due to this redefinition of the macros. We therefore disable the driver in NetBSD/amd64 dom0 in order to facilitate smoothly moving the XEN kernel builds to the new XEN source level API (RELEASE-4.11.1). The fix for this is trivial, but needs the attention of the driver maintainer. To generate a diff of this commit: cvs rdiff -u -r1.162 -r1.163 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.162 src/sys/arch/amd64/conf/XEN3_DOM0:1.163 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.162 Tue Dec 25 11:56:14 2018 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Feb 2 12:05:09 2019 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.162 2018/12/25 11:56:14 mlelstv Exp $ +# $NetBSD: XEN3_DOM0,v 1.163 2019/02/02 12:05:09 cherry Exp $ include "arch/amd64/conf/std.xen" @@ -10,7 +10,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.162 $" +#ident "XEN3_DOM0-$Revision: 1.163 $" maxusers 32 # estimated number of users @@ -371,7 +371,7 @@ ipw* at pci? dev ? function ? # Intel PR iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN iwm* at pci? dev ? function ? # Intel Wireless WiFi Link 7xxx -ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit +#ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit jme* at pci? dev ? function ? # JMicron JMC2[56]0 ethernet le* at pci? dev ? function ? # PCnet-PCI Ethernet lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maya Date: Tue Jan 1 08:09:30 UTC 2019 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add commented out amdgpu. (Builds, untested on hardware) To generate a diff of this commit: cvs rdiff -u -r1.514 -r1.515 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.514 src/sys/arch/amd64/conf/GENERIC:1.515 --- src/sys/arch/amd64/conf/GENERIC:1.514 Tue Dec 25 11:56:14 2018 +++ src/sys/arch/amd64/conf/GENERIC Tue Jan 1 08:09:30 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.514 2018/12/25 11:56:14 mlelstv Exp $ +# $NetBSD: GENERIC,v 1.515 2019/01/01 08:09:30 maya Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.514 $" +#ident "GENERIC-$Revision: 1.515 $" maxusers 64 # estimated number of users @@ -436,6 +436,9 @@ intelfb* at intelfbbus? radeon* at pci? dev ? function ? radeondrmkmsfb* at radeonfbbus? +#amdgpu* at pci? dev ? function ? +#amdgpufb* at amdgpufbbus? + nouveau* at pci? dev ? function ? nouveaufb* at nouveaufbbus?
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: jdolecek Date: Sun Dec 9 11:52:11 UTC 2018 Modified Files: src/sys/arch/amd64/conf: ALL Log Message: remove 'NOT WORKING' for ena(4) - while it was not yet confirmed working on x86, it already is confirmed working on aarm64 so chances are high it will work for x86 too To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 src/sys/arch/amd64/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.108 src/sys/arch/amd64/conf/ALL:1.109 --- src/sys/arch/amd64/conf/ALL:1.108 Sat Nov 24 18:23:29 2018 +++ src/sys/arch/amd64/conf/ALL Sun Dec 9 11:52:11 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.108 2018/11/24 18:23:29 bouyer Exp $ +# $NetBSD: ALL,v 1.109 2018/12/09 11:52:11 jdolecek 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.108 $" +#ident "ALL-$Revision: 1.109 $" maxusers 64 # estimated number of users @@ -952,7 +952,7 @@ bnx* at pci? dev ? function ? # Broadcom bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless cas* at pci? dev ? function ? # Sun Cassini/Cassini+ Ethernet dge* at pci? dev ? function ? # Intel 82597 10GbE LR -ena* at pci? dev ? function ? # NOT WORKING - Amazon Elastic Network Adapter +ena* at pci? dev ? function ? # Amazon Elastic Network Adapter ep* at pci? dev ? function ? # 3Com 3c59x epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet esh* at pci? dev ? function ? # Essential HIPPI card
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Mon Dec 3 00:12:22 UTC 2018 Modified Files: src/sys/arch/amd64/conf: files.amd64 Log Message: KASLR is in files.kern now. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/sys/arch/amd64/conf/files.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/files.amd64 diff -u src/sys/arch/amd64/conf/files.amd64:1.107 src/sys/arch/amd64/conf/files.amd64:1.108 --- src/sys/arch/amd64/conf/files.amd64:1.107 Wed Oct 31 02:26:25 2018 +++ src/sys/arch/amd64/conf/files.amd64 Sun Dec 2 19:12:22 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.amd64,v 1.107 2018/10/31 06:26:25 maxv Exp $ +# $NetBSD: files.amd64,v 1.108 2018/12/03 00:12:22 christos Exp $ # # new style config file for amd64 architecture # @@ -28,8 +28,7 @@ defflag opt_spectre.h SPECTRE_V2_GCC_MIT # defflag USER_LDT -defflag KASLR -defflag eisa.h EISA +defflag eisa.h EISA # Start code file arch/amd64/amd64/locore.S machdep
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: uwe Date: Sat Nov 17 20:29:49 UTC 2018 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add commented out options WSEMUL_DEFAULT="\"vt100\"" If WSEMUL_SUN is enabled it becomes the default emulation which is most likely not what we want here. To generate a diff of this commit: cvs rdiff -u -r1.506 -r1.507 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.506 src/sys/arch/amd64/conf/GENERIC:1.507 --- src/sys/arch/amd64/conf/GENERIC:1.506 Sun Oct 7 08:00:49 2018 +++ src/sys/arch/amd64/conf/GENERIC Sat Nov 17 20:29:49 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.506 2018/10/07 08:00:49 maxv Exp $ +# $NetBSD: GENERIC,v 1.507 2018/11/17 20:29:49 uwe Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.506 $" +#ident "GENERIC-$Revision: 1.507 $" maxusers 64 # estimated number of users @@ -243,8 +243,9 @@ options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARA # wscons options # # builtin terminal emulations -#options WSEMUL_SUN # sun terminal emulation options WSEMUL_VT100 # VT100 / VT220 emulation +#options WSEMUL_SUN # sun terminal emulation +#options WSEMUL_DEFAULT="\"vt100\"" # NB: default is "sun" if enabled # different kernel output - see dev/wscons/wsdisplayvar.h options WS_KERNEL_FG=WSCOL_GREEN #options WS_KERNEL_BG=WSCOL_BLACK
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maxv Date: Sun Oct 7 08:00:49 UTC 2018 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Make it clear that you need to disable SVS if you enable USER_LDT. I could make SVS compatible with it, but there has to be someone doing Wine work first, to justify the effort. To generate a diff of this commit: cvs rdiff -u -r1.505 -r1.506 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.505 src/sys/arch/amd64/conf/GENERIC:1.506 --- src/sys/arch/amd64/conf/GENERIC:1.505 Thu Sep 6 05:36:49 2018 +++ src/sys/arch/amd64/conf/GENERIC Sun Oct 7 08:00:49 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.505 2018/09/06 05:36:49 maxv Exp $ +# $NetBSD: GENERIC,v 1.506 2018/10/07 08:00:49 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.505 $" +#ident "GENERIC-$Revision: 1.506 $" maxusers 64 # estimated number of users @@ -74,12 +74,15 @@ options USERCONF # userconf(4) support options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel # CPU-related options -#options USER_LDT # user-settable LDT; used by WINE options SVS # Separate Virtual Space makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2 # migitation options SPECTRE_V2_GCC_MITIGATION +# USER_LDT. You need to disable SVS to use it. +#options USER_LDT # user-settable LDT; used by WINE +#no options SVS + # CPU features acpicpu* at cpu? # ACPI CPU (including frequency scaling) coretemp* at cpu? # Intel on-die thermal sensor
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: riastradh Date: Mon Aug 27 16:30:51 UTC 2018 Modified Files: src/sys/arch/amd64/conf: ALL Log Message: Add amdgpu to amd64/ALL. To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/sys/arch/amd64/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.99 src/sys/arch/amd64/conf/ALL:1.100 --- src/sys/arch/amd64/conf/ALL:1.99 Sat Aug 25 20:52:40 2018 +++ src/sys/arch/amd64/conf/ALL Mon Aug 27 16:30:51 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.99 2018/08/25 20:52:40 rin Exp $ +# $NetBSD: ALL,v 1.100 2018/08/27 16:30:51 riastradh 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.99 $" +#ident "ALL-$Revision: 1.100 $" maxusers 64 # estimated number of users @@ -515,6 +515,9 @@ intelfb* at intelfbbus? radeon* at pci? dev ? function ? radeondrmkmsfb* at radeonfbbus? +amdgpu* at pci? dev ? function ? +amdgpufb* at amdgpufbbus? + nouveau* at pci? dev ? function ? nouveaufb* at nouveaufbbus?
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maxv Date: Sat Jul 21 06:30:27 UTC 2018 Modified Files: src/sys/arch/amd64/conf: GENERIC_KASLR Log Message: Remove "no options GPROF", we don't have GPROF in the x86 kernels anymore. By the way this caused a warning because GPROF is not defflag'ed correctly... To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amd64/conf/GENERIC_KASLR Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC_KASLR diff -u src/sys/arch/amd64/conf/GENERIC_KASLR:1.4 src/sys/arch/amd64/conf/GENERIC_KASLR:1.5 --- src/sys/arch/amd64/conf/GENERIC_KASLR:1.4 Sun Feb 4 17:54:34 2018 +++ src/sys/arch/amd64/conf/GENERIC_KASLR Sat Jul 21 06:30:27 2018 @@ -1,12 +1,9 @@ -# $NetBSD: GENERIC_KASLR,v 1.4 2018/02/04 17:54:34 maxv Exp $ +# $NetBSD: GENERIC_KASLR,v 1.5 2018/07/21 06:30:27 maxv Exp $ include "arch/amd64/conf/GENERIC" # KDTRACE_HOOKS does not support multiple CTF sections. no options KDTRACE_HOOKS -# The kernel-mode GPROF does not support multiple .text sections. -no options GPROF - makeoptions KASLR=1 # Kernel ASLR options KASLR
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maya Date: Thu Jul 12 10:39:06 UTC 2018 Modified Files: src/sys/arch/amd64/conf: ALL GENERIC Log Message: Add entries for viadrmums to amd64 kernel configs too. Commented out for GENERIC, same as i386. To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.494 -r1.495 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.92 src/sys/arch/amd64/conf/ALL:1.93 --- src/sys/arch/amd64/conf/ALL:1.92 Tue Jul 10 19:58:13 2018 +++ src/sys/arch/amd64/conf/ALL Thu Jul 12 10:39:06 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.92 2018/07/10 19:58:13 maya Exp $ +# $NetBSD: ALL,v 1.93 2018/07/12 10:39:06 maya 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.92 $" +#ident "ALL-$Revision: 1.93 $" maxusers 64 # estimated number of users @@ -521,6 +521,9 @@ radeondrmkmsfb* at radeonfbbus? nouveau* at pci? dev ? function ? nouveaufb* at nouveaufbbus? +# DRMUMS drivers +viadrmums* at drm? + attimer0 at isa? pcppi0 at isa? sysbeep0 at pcppi? Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.494 src/sys/arch/amd64/conf/GENERIC:1.495 --- src/sys/arch/amd64/conf/GENERIC:1.494 Tue Jul 10 17:01:43 2018 +++ src/sys/arch/amd64/conf/GENERIC Thu Jul 12 10:39:06 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.494 2018/07/10 17:01:43 maya Exp $ +# $NetBSD: GENERIC,v 1.495 2018/07/12 10:39:06 maya Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.494 $" +#ident "GENERIC-$Revision: 1.495 $" maxusers 64 # estimated number of users @@ -429,6 +429,9 @@ radeondrmkmsfb* at radeonfbbus? nouveau* at pci? dev ? function ? nouveaufb* at nouveaufbbus? +# DRMUMS drivers +#viadrmums* at drm? + # Cryptographic Devices # PCI cryptographic devices
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: jdolecek Date: Sun Jun 24 17:11:57 UTC 2018 Modified Files: src/sys/arch/amd64/conf: kern.ldscript.Xen Log Message: follow change in rev. 1.22 of kern.ldscript and apply same fix for xen ldscript too, but using just regular PAGE_ALIGN alignment: """ Fix a pretty dumb mistake I made in r1.22: the alignment needs to be in the bss, otherwise the bootloader will use memory before __kernel_end and give a wrong start pa to the kernel. """ this got broke by amd64/locore.S rev. 1.141 which removed an unused variable which forced the alignment this fixes ps/bt in ddb to be able to find symbols and hence PR port-xen/53056 To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amd64/conf/kern.ldscript.Xen Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/kern.ldscript.Xen diff -u src/sys/arch/amd64/conf/kern.ldscript.Xen:1.14 src/sys/arch/amd64/conf/kern.ldscript.Xen:1.15 --- src/sys/arch/amd64/conf/kern.ldscript.Xen:1.14 Sun Jan 7 12:42:46 2018 +++ src/sys/arch/amd64/conf/kern.ldscript.Xen Sun Jun 24 17:11:57 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: kern.ldscript.Xen,v 1.14 2018/01/07 12:42:46 maxv Exp $ */ +/* $NetBSD: kern.ldscript.Xen,v 1.15 2018/06/24 17:11:57 jdolecek Exp $ */ #include "assym.h" @@ -61,7 +61,7 @@ SECTIONS *(.bss) *(.bss.*) *(COMMON) - . = ALIGN(64 / 8); + . = ALIGN(__PAGE_SIZE); } . = ALIGN(__PAGE_SIZE);
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: jakllsch Date: Sat Jun 23 14:14:43 UTC 2018 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: Add acpiecdt* at acpi?. To generate a diff of this commit: cvs rdiff -u -r1.152 -r1.153 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.152 src/sys/arch/amd64/conf/XEN3_DOM0:1.153 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.152 Fri Jun 22 02:51:17 2018 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Jun 23 14:14:42 2018 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.152 2018/06/22 02:51:17 darcy Exp $ +# $NetBSD: XEN3_DOM0,v 1.153 2018/06/23 14:14:42 jakllsch Exp $ include "arch/amd64/conf/std.xen" @@ -10,7 +10,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.152 $" +#ident "XEN3_DOM0-$Revision: 1.153 $" maxusers 32 # estimated number of users @@ -229,7 +229,8 @@ acpiacad* at acpi? # ACPI AC Adapter acpibat* at acpi? # ACPI Battery acpibut* at acpi? # ACPI Button acpidalb* at acpi? # ACPI Direct Application Launch Button -acpiec* at acpi? # ACPI Embedded Controller +acpiec* at acpi? # ACPI Embedded Controller (late) +acpiecdt* at acpi? # ACPI Embedded Controller (early) acpilid* at acpi? # ACPI Lid Switch acpitz* at acpi? # ACPI Thermal Zone aibs* at acpi? # ASUSTeK AI Booster hardware monitor
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: darcy Date: Fri Jun 22 02:51:17 UTC 2018 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: PR port-xen/50446 With approval from bouyer@ and acceptance, sometimes grudgingly, from others I have removed the AGP lines from the XEN3_DOM0 config. I have left a note in the PR suggesting that if it ever gets a proper fix that those lines can be considered for re-inclusion. To generate a diff of this commit: cvs rdiff -u -r1.151 -r1.152 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.151 src/sys/arch/amd64/conf/XEN3_DOM0:1.152 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.151 Thu Jun 7 13:36:28 2018 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Fri Jun 22 02:51:17 2018 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.151 2018/06/07 13:36:28 thorpej Exp $ +# $NetBSD: XEN3_DOM0,v 1.152 2018/06/22 02:51:17 darcy Exp $ include "arch/amd64/conf/std.xen" @@ -10,7 +10,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.151 $" +#ident "XEN3_DOM0-$Revision: 1.152 $" maxusers 32 # estimated number of users @@ -256,13 +256,10 @@ ichlpcib* at pci? dev ? function ? # Int # watchdog and SpeedStep support pcib* at pci? dev ? function ? # PCI-ISA bridges pchb* at pci? dev ? function ? # PCI-Host bridges -options AGP_X86 ppb* at pci? dev ? function ? # PCI-PCI bridges # XXX 'puc's aren't really bridges, but there's no better place for them here puc* at pci? dev ? function ? # PCI "universal" comm. cards -agp* at pchb? - # ISA bus support isa0 at ichlpcib? isa0 at pcib?
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: jdolecek Date: Sat Jun 16 15:04:29 UTC 2018 Modified Files: src/sys/arch/amd64/conf: ALL Log Message: uncomment ena(4) now that it compiles; even though it's not working yet, this ensures it's included in eventual subsystem rototils To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/sys/arch/amd64/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.89 src/sys/arch/amd64/conf/ALL:1.90 --- src/sys/arch/amd64/conf/ALL:1.89 Thu Jun 7 13:36:28 2018 +++ src/sys/arch/amd64/conf/ALL Sat Jun 16 15:04:29 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.89 2018/06/07 13:36:28 thorpej Exp $ +# $NetBSD: ALL,v 1.90 2018/06/16 15:04:29 jdolecek 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.89 $" +#ident "ALL-$Revision: 1.90 $" maxusers 64 # estimated number of users @@ -951,7 +951,7 @@ bwi* at pci? dev ? function ? # Broadcom cas* at pci? dev ? function ? # Sun Cassini/Cassini+ Ethernet dge* at pci? dev ? function ? # Intel 82597 10GbE LR en* at pci? dev ? function ? # ENI/Adaptec ATM -#ena* at pci? dev ? function ? # experimental - Amazon Elastic Network Adapter +ena* at pci? dev ? function ? # NOT WORKING - Amazon Elastic Network Adapter ep* at pci? dev ? function ? # 3Com 3c59x epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet esh* at pci? dev ? function ? # Essential HIPPI card
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Sat Jun 2 15:09:37 UTC 2018 Modified Files: src/sys/arch/amd64/conf: Makefile.amd64 Log Message: Disable sanitizers for the kernel. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/arch/amd64/conf/Makefile.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/Makefile.amd64 diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.70 src/sys/arch/amd64/conf/Makefile.amd64:1.71 --- src/sys/arch/amd64/conf/Makefile.amd64:1.70 Wed Apr 18 06:38:47 2018 +++ src/sys/arch/amd64/conf/Makefile.amd64 Sat Jun 2 11:09:37 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.amd64,v 1.70 2018/04/18 10:38:47 martin Exp $ +# $NetBSD: Makefile.amd64,v 1.71 2018/06/02 15:09:37 christos Exp $ # Makefile for NetBSD # @@ -20,7 +20,8 @@ MACHINE_ARCH=x86_64 USETOOLS?= no NEED_OWN_INSTALL_TARGET?=no -.include +NOSANITIZER= +.include USE_SSP?= yes
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maya Date: Fri May 11 07:44:48 UTC 2018 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Enable bwfm at pci. To generate a diff of this commit: cvs rdiff -u -r1.489 -r1.490 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.489 src/sys/arch/amd64/conf/GENERIC:1.490 --- src/sys/arch/amd64/conf/GENERIC:1.489 Sun Apr 8 00:52:38 2018 +++ src/sys/arch/amd64/conf/GENERIC Fri May 11 07:44:47 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.489 2018/04/08 00:52:38 mrg Exp $ +# $NetBSD: GENERIC,v 1.490 2018/05/11 07:44:47 maya Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.489 $" +#ident "GENERIC-$Revision: 1.490 $" maxusers 64 # estimated number of users @@ -765,6 +765,7 @@ bce* at pci? dev ? function ? # Broadcom bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless +bwfm* at pci? dev ? function ? # Broadcom FullMAC dge* at pci? dev ? function ? # Intel 82597 10GbE LR en* at pci? dev ? function ? # ENI/Adaptec ATM ep* at pci? dev ? function ? # 3Com 3c59x
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: martin
Date: Wed Apr 18 10:38:47 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
Log Message:
Simplify previous, pointed out by mrg.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/amd64/conf/Makefile.amd64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.69 src/sys/arch/amd64/conf/Makefile.amd64:1.70
--- src/sys/arch/amd64/conf/Makefile.amd64:1.69 Wed Apr 18 09:29:35 2018
+++ src/sys/arch/amd64/conf/Makefile.amd64 Wed Apr 18 10:38:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.69 2018/04/18 09:29:35 martin Exp $
+# $NetBSD: Makefile.amd64,v 1.70 2018/04/18 10:38:47 martin Exp $
# Makefile for NetBSD
#
@@ -43,8 +43,7 @@ CFLAGS+= -msoft-float
# For gcc we might need this, but other compilers barf
# CFLAGS+= -mno-fp-ret-in-387
-.if !empty(SPECTRE_V2_GCC_MITIGATION) && ${SPECTRE_V2_GCC_MITIGATION:U0} > 0 \
- && ${HAVE_GCC:U0} > 0
+.if ${SPECTRE_V2_GCC_MITIGATION:U0} > 0 && ${HAVE_GCC:U0} > 0
CFLAGS+= -mindirect-branch=thunk-inline
CFLAGS+= -mindirect-branch-register
.endif
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: martin
Date: Wed Apr 18 09:29:36 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
Log Message:
Fix previous: HAVE_GCC needs to be checked in additon to
SPECTRE_V2_GCC_MITIGATION, but SPECTRE_V2_GCC_MITIGATION being empty is
not a good enough check as it can't be overwritte on the make
command line. Now I can do: "make SPECTRE_V2_GCC_MITIGATION=0" (e.g. when
my gcc is too old for having the indirect-branch options).
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/amd64/conf/Makefile.amd64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.68 src/sys/arch/amd64/conf/Makefile.amd64:1.69
--- src/sys/arch/amd64/conf/Makefile.amd64:1.68 Wed Apr 18 09:20:42 2018
+++ src/sys/arch/amd64/conf/Makefile.amd64 Wed Apr 18 09:29:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.68 2018/04/18 09:20:42 martin Exp $
+# $NetBSD: Makefile.amd64,v 1.69 2018/04/18 09:29:35 martin Exp $
# Makefile for NetBSD
#
@@ -43,7 +43,8 @@ CFLAGS+= -msoft-float
# For gcc we might need this, but other compilers barf
# CFLAGS+= -mno-fp-ret-in-387
-.if !empty(SPECTRE_V2_GCC_MITIGATION) && ${SPECTRE_V2_GCC_MITIGATION:U0} > 0
+.if !empty(SPECTRE_V2_GCC_MITIGATION) && ${SPECTRE_V2_GCC_MITIGATION:U0} > 0 \
+ && ${HAVE_GCC:U0} > 0
CFLAGS+= -mindirect-branch=thunk-inline
CFLAGS+= -mindirect-branch-register
.endif
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: martin
Date: Wed Apr 18 09:20:42 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
Log Message:
Fix copy & pasto
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/amd64/conf/Makefile.amd64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.67 src/sys/arch/amd64/conf/Makefile.amd64:1.68
--- src/sys/arch/amd64/conf/Makefile.amd64:1.67 Sat Apr 7 19:38:06 2018
+++ src/sys/arch/amd64/conf/Makefile.amd64 Wed Apr 18 09:20:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.67 2018/04/07 19:38:06 mrg Exp $
+# $NetBSD: Makefile.amd64,v 1.68 2018/04/18 09:20:42 martin Exp $
# Makefile for NetBSD
#
@@ -43,7 +43,7 @@ CFLAGS+= -msoft-float
# For gcc we might need this, but other compilers barf
# CFLAGS+= -mno-fp-ret-in-387
-.if !empty(SPECTRE_V2_GCC_MITIGATION) && ${HAVE_GCC:U0} > 0
+.if !empty(SPECTRE_V2_GCC_MITIGATION) && ${SPECTRE_V2_GCC_MITIGATION:U0} > 0
CFLAGS+= -mindirect-branch=thunk-inline
CFLAGS+= -mindirect-branch-register
.endif
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: rin Date: Thu Mar 22 12:26:29 UTC 2018 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add njs(4) at pci(4) and cardbus(4). To generate a diff of this commit: cvs rdiff -u -r1.485 -r1.486 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.485 src/sys/arch/amd64/conf/GENERIC:1.486 --- src/sys/arch/amd64/conf/GENERIC:1.485 Mon Feb 26 05:52:50 2018 +++ src/sys/arch/amd64/conf/GENERIC Thu Mar 22 12:26:29 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.485 2018/02/26 05:52:50 maxv Exp $ +# $NetBSD: GENERIC,v 1.486 2018/03/22 12:26:29 rin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.485 $" +#ident "GENERIC-$Revision: 1.486 $" maxusers 64 # estimated number of users @@ -607,6 +607,7 @@ mfi* at pci? dev ? function ? # LSI Mega mly* at pci? dev ? function ? # Mylex AcceleRAID and eXtremeRAID mpt* at pci? dev ? function ? # LSILogic 9x9 and 53c1030 (Fusion-MPT) mpii* at pci? dev ? function ? # LSI Logic Fusion-MPT II +njs* at pci? dev ? function ? # Workbit NinjaSCSI-32 pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI siop* at pci? dev ? function ? # Symbios 53c8xx SCSI esiop* at pci? dev ? function ? # Symbios 53c875 and newer SCSI @@ -621,6 +622,7 @@ spc* at pcmcia? function ? # Fujitsu MB # CardBus SCSI cards adv* at cardbus? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI ahc* at cardbus? function ? # Adaptec ADP-1480 +njs* at cardbus? function ? # Workbit NinjaSCSI-32 # SCSI bus support scsibus* at scsi?
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maxv Date: Mon Feb 26 05:52:50 UTC 2018 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Enable SVS by default. To generate a diff of this commit: cvs rdiff -u -r1.484 -r1.485 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.484 src/sys/arch/amd64/conf/GENERIC:1.485 --- src/sys/arch/amd64/conf/GENERIC:1.484 Sat Jan 27 21:46:54 2018 +++ src/sys/arch/amd64/conf/GENERIC Mon Feb 26 05:52:50 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.484 2018/01/27 21:46:54 pgoyette Exp $ +# $NetBSD: GENERIC,v 1.485 2018/02/26 05:52:50 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.484 $" +#ident "GENERIC-$Revision: 1.485 $" maxusers 64 # estimated number of users @@ -75,7 +75,7 @@ options SYSCTL_INCLUDE_DESCR # Include # CPU-related options #options USER_LDT # user-settable LDT; used by WINE -#options SVS # Separate Virtual Space +options SVS # Separate Virtual Space # CPU features acpicpu* at cpu? # ACPI CPU (including frequency scaling)
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maxv Date: Sun Feb 4 17:54:35 UTC 2018 Modified Files: src/sys/arch/amd64/conf: GENERIC_KASLR Log Message: Explicitly disable the kernel-mode GPROF (even though it is never enabled), and explain a bit. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amd64/conf/GENERIC_KASLR Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC_KASLR diff -u src/sys/arch/amd64/conf/GENERIC_KASLR:1.3 src/sys/arch/amd64/conf/GENERIC_KASLR:1.4 --- src/sys/arch/amd64/conf/GENERIC_KASLR:1.3 Sun Oct 29 17:19:14 2017 +++ src/sys/arch/amd64/conf/GENERIC_KASLR Sun Feb 4 17:54:34 2018 @@ -1,8 +1,12 @@ -# $NetBSD: GENERIC_KASLR,v 1.3 2017/10/29 17:19:14 maxv Exp $ +# $NetBSD: GENERIC_KASLR,v 1.4 2018/02/04 17:54:34 maxv Exp $ include "arch/amd64/conf/GENERIC" +# KDTRACE_HOOKS does not support multiple CTF sections. no options KDTRACE_HOOKS +# The kernel-mode GPROF does not support multiple .text sections. +no options GPROF + makeoptions KASLR=1 # Kernel ASLR options KASLR
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: pgoyette Date: Sat Jan 27 21:46:54 UTC 2018 Modified Files: src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0 Log Message: Update amdzentemp(4) attachment info. Also for ALL, remove duplicate entry for amdtemp(4). To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.483 -r1.484 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.146 -r1.147 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.79 src/sys/arch/amd64/conf/ALL:1.80 --- src/sys/arch/amd64/conf/ALL:1.79 Thu Jan 25 01:21:40 2018 +++ src/sys/arch/amd64/conf/ALL Sat Jan 27 21:46:54 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.79 2018/01/25 01:21:40 christos Exp $ +# $NetBSD: ALL,v 1.80 2018/01/27 21:46:54 pgoyette 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.79 $" +#ident "ALL-$Revision: 1.80 $" maxusers 64 # estimated number of users @@ -423,13 +423,6 @@ options PCIBIOS_SHARP_MM20_FIXUP # this # on anything else. #options PCIINTR_DEBUG # super-verbose PCI interrupt fixup -# Temperatures -amdnb_misc* at pci? # AMD NB Misc Configuration -amdtemp* at amdnb_misc? # AMD CPU Temperature sensors - -amdsmn* at pci?# AMD SMN Configuration -amdzentemp* at amdsmn? # AMD Ryzen Family 17h CPU temp sensors - # PCI bridges rdcpcib* at pci? dev ? function ? # RDC Vortex86/PMX-1000 PCI-ISA w/ pchb* at pci? dev ? function ? # PCI-Host bridges @@ -589,6 +582,10 @@ lpt2 at isa? port 0x3bc # Hardware monitors +# Temperatures +amdsmn* at pci?# AMD SMN Configuration +amdzentemp* at amdsmnbus? # AMD Ryzen Family 17h CPU temp sensors + amdnb_misc* at pci? # AMD NB Misc Configuration amdtemp* at amdnb_misc? # AMD CPU Temperature sensors Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.483 src/sys/arch/amd64/conf/GENERIC:1.484 --- src/sys/arch/amd64/conf/GENERIC:1.483 Fri Jan 26 14:41:22 2018 +++ src/sys/arch/amd64/conf/GENERIC Sat Jan 27 21:46:54 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.483 2018/01/26 14:41:22 maxv Exp $ +# $NetBSD: GENERIC,v 1.484 2018/01/27 21:46:54 pgoyette Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.483 $" +#ident "GENERIC-$Revision: 1.484 $" maxusers 64 # estimated number of users @@ -476,7 +476,7 @@ amdnb_misc* at pci? # AMD NB Misc Conf amdtemp* at amdnb_misc? # AMD CPU Temperature sensors amdsmn* at pci?# AMD SMN Configuration -amdzentemp* at amdsmn? # AMD Ryzen Family 17h CPU temp sensors +amdzentemp* at amdsmnbus? # AMD Ryzen Family 17h CPU temp sensors # Winbond LPC Super I/O #wbsio* at isa? port 0x2e Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.146 src/sys/arch/amd64/conf/XEN3_DOM0:1.147 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.146 Thu Jan 25 01:21:40 2018 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Jan 27 21:46:54 2018 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.146 2018/01/25 01:21:40 christos Exp $ +# $NetBSD: XEN3_DOM0,v 1.147 2018/01/27 21:46:54 pgoyette Exp $ include "arch/amd64/conf/std.xen" @@ -10,7 +10,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.146 $" +#ident "XEN3_DOM0-$Revision: 1.147 $" maxusers 32 # estimated number of users @@ -299,7 +299,7 @@ amdnb_misc* at pci? # AMD NB Misc Conf amdtemp* at amdnb_misc? # AMD CPU Temperature sensors amdsmn* at pci?# AMD SMN Configuration -amdzentemp* at amdsmn? # AMD Ryzen Family 17h CPU temp sensors +amdzentemp* at amdsmnbus? # AMD Ryzen Family 17h CPU temp sensors # AMD 768 and 8111 power/ACPI controllers amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maxv Date: Fri Jan 26 14:41:22 UTC 2018 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add etherip, so that we at least know it exists on amd64. To generate a diff of this commit: cvs rdiff -u -r1.482 -r1.483 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.482 src/sys/arch/amd64/conf/GENERIC:1.483 --- src/sys/arch/amd64/conf/GENERIC:1.482 Thu Jan 25 01:21:40 2018 +++ src/sys/arch/amd64/conf/GENERIC Fri Jan 26 14:41:22 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.482 2018/01/25 01:21:40 christos Exp $ +# $NetBSD: GENERIC,v 1.483 2018/01/26 14:41:22 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.482 $" +#ident "GENERIC-$Revision: 1.483 $" maxusers 64 # estimated number of users @@ -1299,6 +1299,7 @@ pseudo-device bridge # simple inter-ne #options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too pseudo-device agr # IEEE 802.3ad link aggregation pseudo-device l2tp # L2TPv3 interface +#pseudo-device etherip # Tunnel Ethernet over IP #pseudo-device pf # PF packet filter #pseudo-device pflog # PF log if #pseudo-device pfsync # PF sync if
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Thu Jan 25 01:21:40 UTC 2018 Modified Files: src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0 Log Message: add amdzentemp To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.481 -r1.482 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.145 -r1.146 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.78 src/sys/arch/amd64/conf/ALL:1.79 --- src/sys/arch/amd64/conf/ALL:1.78 Sat Jan 13 07:38:16 2018 +++ src/sys/arch/amd64/conf/ALL Wed Jan 24 20:21:40 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.78 2018/01/13 12:38:16 christos Exp $ +# $NetBSD: ALL,v 1.79 2018/01/25 01:21:40 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.78 $" +#ident "ALL-$Revision: 1.79 $" maxusers 64 # estimated number of users @@ -427,6 +427,9 @@ options PCIBIOS_SHARP_MM20_FIXUP # this amdnb_misc* at pci? # AMD NB Misc Configuration amdtemp* at amdnb_misc? # AMD CPU Temperature sensors +amdsmn* at pci?# AMD SMN Configuration +amdzentemp* at amdsmn? # AMD Ryzen Family 17h CPU temp sensors + # PCI bridges rdcpcib* at pci? dev ? function ? # RDC Vortex86/PMX-1000 PCI-ISA w/ pchb* at pci? dev ? function ? # PCI-Host bridges Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.481 src/sys/arch/amd64/conf/GENERIC:1.482 --- src/sys/arch/amd64/conf/GENERIC:1.481 Sat Jan 13 07:38:16 2018 +++ src/sys/arch/amd64/conf/GENERIC Wed Jan 24 20:21:40 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.481 2018/01/13 12:38:16 christos Exp $ +# $NetBSD: GENERIC,v 1.482 2018/01/25 01:21:40 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.481 $" +#ident "GENERIC-$Revision: 1.482 $" maxusers 64 # estimated number of users @@ -475,6 +475,9 @@ lpt1 at isa? port 0x278 amdnb_misc* at pci? # AMD NB Misc Configuration amdtemp* at amdnb_misc? # AMD CPU Temperature sensors +amdsmn* at pci?# AMD SMN Configuration +amdzentemp* at amdsmn? # AMD Ryzen Family 17h CPU temp sensors + # Winbond LPC Super I/O #wbsio* at isa? port 0x2e #wbsio* at isa? port 0x4e Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.145 src/sys/arch/amd64/conf/XEN3_DOM0:1.146 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.145 Tue Jan 23 09:47:53 2018 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Wed Jan 24 20:21:40 2018 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.145 2018/01/23 14:47:53 sevan Exp $ +# $NetBSD: XEN3_DOM0,v 1.146 2018/01/25 01:21:40 christos Exp $ include "arch/amd64/conf/std.xen" @@ -10,7 +10,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.145 $" +#ident "XEN3_DOM0-$Revision: 1.146 $" maxusers 32 # estimated number of users @@ -298,6 +298,9 @@ lpt0 at isa? port 0x378 irq 7 # standard amdnb_misc* at pci? # AMD NB Misc Configuration amdtemp* at amdnb_misc? # AMD CPU Temperature sensors +amdsmn* at pci?# AMD SMN Configuration +amdzentemp* at amdsmn? # AMD Ryzen Family 17h CPU temp sensors + # AMD 768 and 8111 power/ACPI controllers amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface #iic* at amdpm? # sensors below are on this bus
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Sat Jan 13 12:38:16 UTC 2018 Modified Files: src/sys/arch/amd64/conf: ALL GENERIC MODULAR XEN3_DOM0 XEN3_DOMU Log Message: added commented out AUTOFS pseudo-device entries To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.480 -r1.481 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amd64/conf/MODULAR cvs rdiff -u -r1.143 -r1.144 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.81 -r1.82 src/sys/arch/amd64/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.77 src/sys/arch/amd64/conf/ALL:1.78 --- src/sys/arch/amd64/conf/ALL:1.77 Wed Jan 10 06:11:20 2018 +++ src/sys/arch/amd64/conf/ALL Sat Jan 13 07:38:16 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.77 2018/01/10 11:11:20 knakahara Exp $ +# $NetBSD: ALL,v 1.78 2018/01/13 12:38:16 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.77 $" +#ident "ALL-$Revision: 1.78 $" maxusers 64 # estimated number of users @@ -1654,6 +1654,9 @@ pseudo-device vcoda # coda minicache < # a pseudo device needed for SMBFS pseudo-device nsmb # experimental - SMB requester +# a pseudo device needed for AUTOFS +pseudo-device autofs # experimental - AUTOFS + # iSCSI initiator pseudo-device iscsi Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.480 src/sys/arch/amd64/conf/GENERIC:1.481 --- src/sys/arch/amd64/conf/GENERIC:1.480 Wed Jan 10 06:11:20 2018 +++ src/sys/arch/amd64/conf/GENERIC Sat Jan 13 07:38:16 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.480 2018/01/10 11:11:20 knakahara Exp $ +# $NetBSD: GENERIC,v 1.481 2018/01/13 12:38:16 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.480 $" +#ident "GENERIC-$Revision: 1.481 $" maxusers 64 # estimated number of users @@ -1325,6 +1325,9 @@ pseudo-device vcoda # coda minicache < # a pseudo device needed for SMBFS pseudo-device nsmb # experimental - SMB requester +# a pseudo device needed for AUTOFS +#pseudo-device autofs # experimental - AUTOFS + # wscons pseudo-devices pseudo-device wsmux # mouse & keyboard multiplexor pseudo-device wsfont Index: src/sys/arch/amd64/conf/MODULAR diff -u src/sys/arch/amd64/conf/MODULAR:1.10 src/sys/arch/amd64/conf/MODULAR:1.11 --- src/sys/arch/amd64/conf/MODULAR:1.10 Mon Jan 8 22:31:12 2018 +++ src/sys/arch/amd64/conf/MODULAR Sat Jan 13 07:38:16 2018 @@ -1,4 +1,4 @@ -# $NetBSD: MODULAR,v 1.10 2018/01/09 03:31:12 christos Exp $ +# $NetBSD: MODULAR,v 1.11 2018/01/13 12:38:16 christos Exp $ # # Try to exclude all the drivers in GENERIC that have been modularized # XXX: incomplete @@ -132,6 +132,7 @@ options MODULAR_DEFAULT_AUTOLOAD # miscellaneous pseudo-devices -no pseudo-device clockctl # user control of clock subsystem -no pseudo-device vcoda # coda minicache <-> venus comm. +-no pseudo-device autofs # experimental - AUTOFS # a pseudo device needed for SMBFS -no pseudo-device nsmb # experimental - SMB requester Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.143 src/sys/arch/amd64/conf/XEN3_DOM0:1.144 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.143 Mon Jan 8 22:31:12 2018 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Jan 13 07:38:16 2018 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.143 2018/01/09 03:31:12 christos Exp $ +# $NetBSD: XEN3_DOM0,v 1.144 2018/01/13 12:38:16 christos Exp $ include "arch/amd64/conf/std.xen" @@ -10,7 +10,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.143 $" +#ident "XEN3_DOM0-$Revision: 1.144 $" maxusers 32 # estimated number of users @@ -888,6 +888,9 @@ pseudo-device vcoda # coda minicache < # a pseudo device needed for SMBFS pseudo-device nsmb # experimental - SMB requester +# a pseudo device needed for AUTOFS +#pseudo-device autofs # experimental - AUTOFS + # iSCSI initiator #pseudo-device iscsi Index: src/sys/arch/amd64/conf/XEN3_DOMU diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.81 src/sys/arch/amd64/conf/XEN3_DOMU:1.82 --- src/sys/arch/amd64/conf/XEN3_DOMU:1.81 Mon Jan 8 22:31:12 2018 +++ src/sys/arch/amd64/conf/XEN3_DOMU Sat Jan 13 07:38:16 2018 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.81 2018/01/09 03:31:12 christos Exp $ +# $NetBSD: XEN3_DOMU,v 1.82 2018/01/13 12:38:16 christos Exp $ include "arch/amd64/conf/std.xen" @@ -10,7 +10,7 @@ options
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: knakahara Date: Wed Jan 10 11:11:20 UTC 2018 Modified Files: src/sys/arch/amd64/conf: ALL GENERIC Log Message: add ipsec(4) interface to amd64/GENERIC and amd64/ALL configs. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.479 -r1.480 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.76 src/sys/arch/amd64/conf/ALL:1.77 --- src/sys/arch/amd64/conf/ALL:1.76 Tue Jan 9 03:31:12 2018 +++ src/sys/arch/amd64/conf/ALL Wed Jan 10 11:11:20 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.76 2018/01/09 03:31:12 christos Exp $ +# $NetBSD: ALL,v 1.77 2018/01/10 11:11:20 knakahara 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.76 $" +#ident "ALL-$Revision: 1.77 $" maxusers 64 # estimated number of users @@ -1610,6 +1610,7 @@ pseudo-device tap # virtual Ethernet pseudo-device tun # network tunneling over tty pseudo-device gre # generic L3 over IP tunnel pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC 1933) +pseudo-device ipsecif # tunnel interface for routing based ipsec pseudo-device faith # IPv[46] tcp relay translation i/f pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation pseudo-device vlan # IEEE 802.1q encapsulation Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.479 src/sys/arch/amd64/conf/GENERIC:1.480 --- src/sys/arch/amd64/conf/GENERIC:1.479 Tue Jan 9 03:31:12 2018 +++ src/sys/arch/amd64/conf/GENERIC Wed Jan 10 11:11:20 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.479 2018/01/09 03:31:12 christos Exp $ +# $NetBSD: GENERIC,v 1.480 2018/01/10 11:11:20 knakahara Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.479 $" +#ident "GENERIC-$Revision: 1.480 $" maxusers 64 # estimated number of users @@ -1288,6 +1288,7 @@ pseudo-device tun # network tunneling pseudo-device tap # virtual Ethernet pseudo-device gre # generic L3 over IP tunnel pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933) +pseudo-device ipsecif # tunnel interface for routing based ipsec #pseudo-device faith # IPv[46] tcp relay translation i/f pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation pseudo-device vlan # IEEE 802.1q encapsulation
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: martin Date: Mon Jan 8 06:29:19 UTC 2018 Modified Files: src/sys/arch/amd64/conf: files.amd64 Log Message: Now that SVS is defined in file.x86, do not repeat it here To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/arch/amd64/conf/files.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/files.amd64 diff -u src/sys/arch/amd64/conf/files.amd64:1.98 src/sys/arch/amd64/conf/files.amd64:1.99 --- src/sys/arch/amd64/conf/files.amd64:1.98 Sun Jan 7 16:10:16 2018 +++ src/sys/arch/amd64/conf/files.amd64 Mon Jan 8 06:29:19 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.amd64,v 1.98 2018/01/07 16:10:16 maxv Exp $ +# $NetBSD: files.amd64,v 1.99 2018/01/08 06:29:19 martin Exp $ # # new style config file for amd64 architecture # @@ -27,7 +27,7 @@ defparam opt_physmem.h PHYSMEM_MAX_ADDR defflag PMC defflag USER_LDT defflag KASLR -defflag SVS +# defflag SVS # already defined in files.x86 defflag eisa.h EISA # Start code
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maxv Date: Sun Jan 7 16:10:52 UTC 2018 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Don't enable SVS yet. To generate a diff of this commit: cvs rdiff -u -r1.477 -r1.478 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.477 src/sys/arch/amd64/conf/GENERIC:1.478 --- src/sys/arch/amd64/conf/GENERIC:1.477 Sun Jan 7 16:10:16 2018 +++ src/sys/arch/amd64/conf/GENERIC Sun Jan 7 16:10:52 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.477 2018/01/07 16:10:16 maxv Exp $ +# $NetBSD: GENERIC,v 1.478 2018/01/07 16:10:52 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.477 $" +#ident "GENERIC-$Revision: 1.478 $" maxusers 64 # estimated number of users @@ -75,7 +75,7 @@ options SYSCTL_INCLUDE_DESCR # Include # CPU-related options #options USER_LDT # user-settable LDT; used by WINE -options SVS # Separate Virtual Space +#options SVS # Separate Virtual Space # CPU features acpicpu* at cpu? # ACPI CPU (including frequency scaling)
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maxv Date: Mon Jan 1 08:14:14 UTC 2018 Modified Files: src/sys/arch/amd64/conf: files.amd64 Log Message: Compile the prekern entry point only under KASLR. To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/sys/arch/amd64/conf/files.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/files.amd64 diff -u src/sys/arch/amd64/conf/files.amd64:1.96 src/sys/arch/amd64/conf/files.amd64:1.97 --- src/sys/arch/amd64/conf/files.amd64:1.96 Thu Dec 7 23:11:50 2017 +++ src/sys/arch/amd64/conf/files.amd64 Mon Jan 1 08:14:13 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.amd64,v 1.96 2017/12/07 23:11:50 christos Exp $ +# $NetBSD: files.amd64,v 1.97 2018/01/01 08:14:13 maxv Exp $ # # new style config file for amd64 architecture # @@ -47,7 +47,7 @@ file arch/amd64/amd64/kobj_machdep.c mo file kern/subr_disk_mbr.c disk file arch/amd64/amd64/gdt.c machdep file arch/amd64/amd64/machdep.c machdep -file arch/amd64/amd64/prekern.c machdep +file arch/amd64/amd64/prekern.c kaslr file arch/amd64/amd64/process_machdep.c machdep file arch/amd64/amd64/trap.c machdep file arch/x86/x86/fpu.c machdep
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Sun Dec 31 03:38:06 UTC 2017 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: explain that a.out never shipped on x86_64 and put back compat_nomid To generate a diff of this commit: cvs rdiff -u -r1.475 -r1.476 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.475 src/sys/arch/amd64/conf/GENERIC:1.476 --- src/sys/arch/amd64/conf/GENERIC:1.475 Sun Dec 10 12:19:48 2017 +++ src/sys/arch/amd64/conf/GENERIC Sat Dec 30 22:38:06 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.475 2017/12/10 17:19:48 bouyer Exp $ +# $NetBSD: GENERIC,v 1.476 2017/12/31 03:38:06 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.475 $" +#ident "GENERIC-$Revision: 1.476 $" maxusers 64 # estimated number of users @@ -115,11 +115,14 @@ makeoptions DEBUG="-g" # compile full sy options KDTRACE_HOOKS # kernel DTrace hooks # Compatibility options +# x86_64 never shipped with a.out binaries; the two options below are +# only relevant to 32-bit i386 binaries #options EXEC_AOUT # required by binaries from before 1.5 +#options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI # NetBSD backward compatibility. Support goes from COMPAT_15 up until # the latest release. Note that really old compat (< COMPAT_16) is only -# useful for 32-bit binaries. +# useful for 32-bit i386 binaries. include "conf/compat_netbsd15.config" #options COMPAT_386BSD_MBRPART # recognize old partition ID
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: dholland Date: Tue Dec 5 21:00:27 UTC 2017 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add missing wsbell, commented out with a note that it's apparently only a module by default. This way people making their own configs have half a prayer of realizing they might need to turn it on, instead of just not getting beeps any more for no clear reason. XXX: Wasn't the agreement after the last round of module flamage that XXX: things shouldn't be module-only in GENERIC? To generate a diff of this commit: cvs rdiff -u -r1.472 -r1.473 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.472 src/sys/arch/amd64/conf/GENERIC:1.473 --- src/sys/arch/amd64/conf/GENERIC:1.472 Tue Dec 5 20:32:24 2017 +++ src/sys/arch/amd64/conf/GENERIC Tue Dec 5 21:00:26 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.472 2017/12/05 20:32:24 dholland Exp $ +# $NetBSD: GENERIC,v 1.473 2017/12/05 21:00:26 dholland Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.472 $" +#ident "GENERIC-$Revision: 1.473 $" maxusers 64 # estimated number of users @@ -1117,6 +1117,7 @@ audio* at audiobus? # The spkr driver provides a simple tone interface to the built in speaker. spkr* at pcppi? # PC speaker spkr* at audio? # PC speaker (synthesized) +#wsbell* at spkr? # Bell for wscons display (module by default) # MPU 401 UARTs #mpu* at isa? port 0x330 irq 9 # MPU401 or compatible card
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: dholland Date: Tue Dec 5 20:32:24 UTC 2017 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Sort the file system options by which fs they apply to. To generate a diff of this commit: cvs rdiff -u -r1.471 -r1.472 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.471 src/sys/arch/amd64/conf/GENERIC:1.472 --- src/sys/arch/amd64/conf/GENERIC:1.471 Sat Dec 2 13:03:15 2017 +++ src/sys/arch/amd64/conf/GENERIC Tue Dec 5 20:32:24 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.471 2017/12/02 13:03:15 maxv Exp $ +# $NetBSD: GENERIC,v 1.472 2017/12/05 20:32:24 dholland Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.471 $" +#ident "GENERIC-$Revision: 1.472 $" maxusers 64 # estimated number of users @@ -164,19 +164,22 @@ file-system PTYFS # /dev/ptm support #file-system NILFS # experimental - NTT's NiLFS(2) # File system options +# ffs options QUOTA # legacy UFS quotas options QUOTA2 # new, in-filesystem UFS quotas -#options DISKLABEL_EI # disklabel Endian Independent support options FFS_EI # FFS Endian Independent support options WAPBL # File system journaling support # Note that UFS_DIRHASH is suspected of causing kernel memory corruption. # It is not recommended for general use. #options UFS_DIRHASH # UFS Large Directory Hashing - Experimental -options NFSSERVER # Network File System server -#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and -# immutable) behave as system flags. #options FFS_NO_SNAPSHOT # No FFS snapshot support options UFS_EXTATTR # Extended attribute support for UFS1 +# ext2fs +#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and +# immutable) behave as system flags. +# other +#options DISKLABEL_EI # disklabel Endian Independent support +options NFSSERVER # Network File System server # Networking options #options GATEWAY # packet forwarding
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maxv Date: Sat Dec 2 09:59:02 UTC 2017 Modified Files: src/sys/arch/amd64/conf: ALL Log Message: Remove options that do not exist on amd64. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/arch/amd64/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.72 src/sys/arch/amd64/conf/ALL:1.73 --- src/sys/arch/amd64/conf/ALL:1.72 Sat Nov 25 16:32:48 2017 +++ src/sys/arch/amd64/conf/ALL Sat Dec 2 09:59:02 2017 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.72 2017/11/25 16:32:48 jmcneill Exp $ +# $NetBSD: ALL,v 1.73 2017/12/02 09:59:02 maxv 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.72 $" +#ident "ALL-$Revision: 1.73 $" maxusers 64 # estimated number of users @@ -139,13 +139,7 @@ options COMPAT_OSSAUDIO # OSS (Voxware) options COMPAT_NETBSD32 # NetBSD 32-bit options COMPAT_LINUX # binary compatibility with Linux options COMPAT_LINUX32 # binary compatibility with Linux 32-bit -options COMPAT_FREEBSD # binary compatibility with FreeBSD options COMPAT_NDIS # NDIS network driver -options COMPAT_OSF1 # OSF1 binary compatibility -#options COMPAT_SVR4 # SVR4 binary compatibility (no amd64) -#options COMPAT_SVR4_32 # SVR4 32-bit binary compatibility (no amd64) -options COMPAT_ULTRIX # DEC Ultrix binary compatibility -options COMPAT_SUNOS # SunOS 4.x binary compatibility # Wedge support options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: jmcneill Date: Sat Nov 25 16:32:48 UTC 2017 Modified Files: src/sys/arch/amd64/conf: ALL GENERIC Log Message: Add qemufwcfg (QEMU Firmware Configuration device) To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.468 -r1.469 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.71 src/sys/arch/amd64/conf/ALL:1.72 --- src/sys/arch/amd64/conf/ALL:1.71 Thu Sep 14 07:58:39 2017 +++ src/sys/arch/amd64/conf/ALL Sat Nov 25 16:32:48 2017 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.71 2017/09/14 07:58:39 mrg Exp $ +# $NetBSD: ALL,v 1.72 2017/11/25 16:32:48 jmcneill 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.71 $" +#ident "ALL-$Revision: 1.72 $" maxusers 64 # estimated number of users @@ -387,6 +387,7 @@ lpt* at acpi? # Parallel port mpu* at acpi? # Roland MPU-401 MIDI UART pckbc* at acpi? # PC keyboard controller pcppi* at acpi? # AT-style speaker sound +qemufwcfg* at acpi? # QEMU Firmware Configuration device sdhc* at acpi? # SD Host Controller sony* at acpi? # Sony Notebook Controller spic* at acpi? # Sony Programmable I/O Controller Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.468 src/sys/arch/amd64/conf/GENERIC:1.469 --- src/sys/arch/amd64/conf/GENERIC:1.468 Mon Nov 6 02:57:18 2017 +++ src/sys/arch/amd64/conf/GENERIC Sat Nov 25 16:32:48 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.468 2017/11/06 02:57:18 rin Exp $ +# $NetBSD: GENERIC,v 1.469 2017/11/25 16:32:48 jmcneill Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.468 $" +#ident "GENERIC-$Revision: 1.469 $" maxusers 64 # estimated number of users @@ -313,6 +313,7 @@ joy* at acpi? # Joystick/Game port mpu* at acpi? # Roland MPU-401 MIDI UART pckbc* at acpi? # PC keyboard controller pcppi* at acpi? # AT-style speaker sound +qemufwcfg* at acpi? # QEMU Firmware Configuration device sdhc* at acpi? # SD Host Controller sony* at acpi? # Sony Notebook Controller spic* at acpi? # Sony Programmable I/O Controller
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: maxv
Date: Tue Nov 14 10:15:40 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64 kern.ldscript.kaslr
Log Message:
Split each kernel section into sub-blocks of approximately 2MB. The newly
created sections are named .origname.i, for example:
.text -> { .text .text.0 .text.1 .text.2 .text.3 .text.4 }
Each section is randomized independently by the prekern - and in a random
order obviously. As a result we can get intertwined mappings, of the type:
+---+---+--+-+---+---+---+--+-
| text1 | NOTMAPPED | bss0 | rodata1 | NOTMAPPED | data2 | text3 | bss1 |
+---+---+--+-+---+---+---+--+-
-+-
rodata0 | ...
-+-
The CTF section is dropped completely, because (a) when split it becomes
enormous for some reason (that I don't quite understand, verily), and (b)
the kernel expects only one CTF and can't handle several of them.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/conf/kern.ldscript.kaslr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.62 src/sys/arch/amd64/conf/Makefile.amd64:1.63
--- src/sys/arch/amd64/conf/Makefile.amd64:1.62 Tue Nov 14 09:56:26 2017
+++ src/sys/arch/amd64/conf/Makefile.amd64 Tue Nov 14 10:15:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.62 2017/11/14 09:56:26 maxv Exp $
+# $NetBSD: Makefile.amd64,v 1.63 2017/11/14 10:15:40 maxv Exp $
# Makefile for NetBSD
#
@@ -62,7 +62,7 @@ KERN_AS= library
##
TEXTADDR?= 0x8020
.if defined(KASLR)
-EXTRA_LINKFLAGS= -r -d
+EXTRA_LINKFLAGS= --split-by-file=0x20 -r -d
KERNLDSCRIPT?= ${AMD64}/conf/kern.ldscript.kaslr
.else
EXTRA_LINKFLAGS= -z max-page-size=0x20
Index: src/sys/arch/amd64/conf/kern.ldscript.kaslr
diff -u src/sys/arch/amd64/conf/kern.ldscript.kaslr:1.2 src/sys/arch/amd64/conf/kern.ldscript.kaslr:1.3
--- src/sys/arch/amd64/conf/kern.ldscript.kaslr:1.2 Mon Nov 13 20:01:48 2017
+++ src/sys/arch/amd64/conf/kern.ldscript.kaslr Tue Nov 14 10:15:40 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.kaslr,v 1.2 2017/11/13 20:01:48 maxv Exp $ */
+/* $NetBSD: kern.ldscript.kaslr,v 1.3 2017/11/14 10:15:40 maxv Exp $ */
#include "assym.h"
@@ -57,4 +57,10 @@ SECTIONS
{
KEEP(*(.note.netbsd.ident));
}
+
+ /DISCARD/ :
+ {
+ *(.SUNW_ctf)
+ *(.SUNW_ctf.*)
+ }
}
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: maxv
Date: Tue Nov 14 09:56:26 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
Log Message:
Remove max-page-size on KASLR, it doesn't play any role.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/amd64/conf/Makefile.amd64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.61 src/sys/arch/amd64/conf/Makefile.amd64:1.62
--- src/sys/arch/amd64/conf/Makefile.amd64:1.61 Thu Nov 9 15:46:48 2017
+++ src/sys/arch/amd64/conf/Makefile.amd64 Tue Nov 14 09:56:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.61 2017/11/09 15:46:48 maxv Exp $
+# $NetBSD: Makefile.amd64,v 1.62 2017/11/14 09:56:26 maxv Exp $
# Makefile for NetBSD
#
@@ -62,7 +62,7 @@ KERN_AS= library
##
TEXTADDR?= 0x8020
.if defined(KASLR)
-EXTRA_LINKFLAGS= -z max-page-size=0x20 -r -d
+EXTRA_LINKFLAGS= -r -d
KERNLDSCRIPT?= ${AMD64}/conf/kern.ldscript.kaslr
.else
EXTRA_LINKFLAGS= -z max-page-size=0x20
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: maxv
Date: Mon Nov 13 20:01:48 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: kern.ldscript.kaslr
Log Message:
Use SUBALIGN, to force the alignment at the section level, and remove
the inter-section ALIGN which doesn't do anything since the physical
address of the section is chosen dynamically by the bootloader.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amd64/conf/kern.ldscript.kaslr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/kern.ldscript.kaslr
diff -u src/sys/arch/amd64/conf/kern.ldscript.kaslr:1.1 src/sys/arch/amd64/conf/kern.ldscript.kaslr:1.2
--- src/sys/arch/amd64/conf/kern.ldscript.kaslr:1.1 Thu Nov 9 15:46:48 2017
+++ src/sys/arch/amd64/conf/kern.ldscript.kaslr Mon Nov 13 20:01:48 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.kaslr,v 1.1 2017/11/09 15:46:48 maxv Exp $ */
+/* $NetBSD: kern.ldscript.kaslr,v 1.2 2017/11/13 20:01:48 maxv Exp $ */
#include "assym.h"
@@ -27,17 +27,16 @@ SECTIONS
*(.data)
}
- . = ALIGN(COHERENCY_UNIT);
- .data.cacheline_aligned :
+ .data.cacheline_aligned : SUBALIGN(COHERENCY_UNIT)
{
*(.data.cacheline_aligned)
+ . = ALIGN(COHERENCY_UNIT);
}
- . = ALIGN(COHERENCY_UNIT);
- .data.read_mostly :
+ .data.read_mostly : SUBALIGN(COHERENCY_UNIT)
{
*(.data.read_mostly)
+ . = ALIGN(COHERENCY_UNIT);
}
- . = ALIGN(COHERENCY_UNIT);
_edata = . ;
PROVIDE (edata = .) ;
@@ -59,4 +58,3 @@ SECTIONS
KEEP(*(.note.netbsd.ident));
}
}
-
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: maxv
Date: Thu Nov 9 15:46:48 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
Added Files:
src/sys/arch/amd64/conf: kern.ldscript.kaslr
Log Message:
Use another ld script for kaslr kernels, in which there are no alignment
directives. They don't matter since the bootloader overwrites them.
But, normally we still need to make sure .data.read_mostly is aligned.
Unfortunately I couldn't find any way to force sh_addralign to be 64, so
I'm leaving the alignment there as a useless reminder.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r0 -r1.1 src/sys/arch/amd64/conf/kern.ldscript.kaslr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.60 src/sys/arch/amd64/conf/Makefile.amd64:1.61
--- src/sys/arch/amd64/conf/Makefile.amd64:1.60 Wed Nov 1 09:31:24 2017
+++ src/sys/arch/amd64/conf/Makefile.amd64 Thu Nov 9 15:46:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.60 2017/11/01 09:31:24 maxv Exp $
+# $NetBSD: Makefile.amd64,v 1.61 2017/11/09 15:46:48 maxv Exp $
# Makefile for NetBSD
#
@@ -63,11 +63,12 @@ KERN_AS= library
TEXTADDR?= 0x8020
.if defined(KASLR)
EXTRA_LINKFLAGS= -z max-page-size=0x20 -r -d
+KERNLDSCRIPT?= ${AMD64}/conf/kern.ldscript.kaslr
.else
EXTRA_LINKFLAGS= -z max-page-size=0x20
+KERNLDSCRIPT?= ${AMD64}/conf/kern.ldscript
.endif
LINKFLAGS_NORMAL= -X
-KERNLDSCRIPT?= ${AMD64}/conf/kern.ldscript
##
## (6) port specific target dependencies
Added files:
Index: src/sys/arch/amd64/conf/kern.ldscript.kaslr
diff -u /dev/null src/sys/arch/amd64/conf/kern.ldscript.kaslr:1.1
--- /dev/null Thu Nov 9 15:46:48 2017
+++ src/sys/arch/amd64/conf/kern.ldscript.kaslr Thu Nov 9 15:46:48 2017
@@ -0,0 +1,62 @@
+/* $NetBSD: kern.ldscript.kaslr,v 1.1 2017/11/09 15:46:48 maxv Exp $ */
+
+#include "assym.h"
+
+ENTRY(_start)
+SECTIONS
+{
+ .text :
+ {
+ *(.text)
+ *(.text.*)
+ *(.stub)
+ } =0xCC
+ _etext = . ;
+ PROVIDE (etext = .) ;
+
+ __rodata_start = . ;
+ .rodata :
+ {
+ *(.rodata)
+ *(.rodata.*)
+ }
+
+ __data_start = . ;
+ .data :
+ {
+ *(.data)
+ }
+
+ . = ALIGN(COHERENCY_UNIT);
+ .data.cacheline_aligned :
+ {
+ *(.data.cacheline_aligned)
+ }
+ . = ALIGN(COHERENCY_UNIT);
+ .data.read_mostly :
+ {
+ *(.data.read_mostly)
+ }
+ . = ALIGN(COHERENCY_UNIT);
+
+ _edata = . ;
+ PROVIDE (edata = .) ;
+ __bss_start = . ;
+ .bss :
+ {
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ }
+
+ /* End of the kernel image */
+ __kernel_end = . ;
+
+ _end = . ;
+ PROVIDE (end = .) ;
+ .note.netbsd.ident :
+ {
+ KEEP(*(.note.netbsd.ident));
+ }
+}
+
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: maxv
Date: Wed Nov 1 09:31:24 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
Log Message:
Add linux_sigcode.o, otherwise it doesn't get rebuilt.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/amd64/conf/Makefile.amd64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.59 src/sys/arch/amd64/conf/Makefile.amd64:1.60
--- src/sys/arch/amd64/conf/Makefile.amd64:1.59 Sat Oct 7 10:16:47 2017
+++ src/sys/arch/amd64/conf/Makefile.amd64 Wed Nov 1 09:31:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.59 2017/10/07 10:16:47 maxv Exp $
+# $NetBSD: Makefile.amd64,v 1.60 2017/11/01 09:31:24 maxv Exp $
# Makefile for NetBSD
#
@@ -77,7 +77,7 @@ KERNLDSCRIPT?= ${AMD64}/conf/kern.ldscri
locore.o machdep.o: Makefile
acpi_wakeup_low.o amd64func.o busfunc.o cpufunc.o cpu_in_cksum.o: assym.h
-linux32_sigcode.o lock_stubs.o mptramp.o: assym.h
+linux_sigcode.o linux32_sigcode.o lock_stubs.o mptramp.o: assym.h
netbsd32_sigcode.o: assym.h
##
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maxv Date: Sun Oct 29 17:19:14 UTC 2017 Modified Files: src/sys/arch/amd64/conf: GENERIC_KASLR Log Message: Mmh, we don't map the CTF section on kaslr kernels, so disable KDTRACE_HOOKS for now. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/conf/GENERIC_KASLR Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC_KASLR diff -u src/sys/arch/amd64/conf/GENERIC_KASLR:1.2 src/sys/arch/amd64/conf/GENERIC_KASLR:1.3 --- src/sys/arch/amd64/conf/GENERIC_KASLR:1.2 Sun Oct 8 09:06:50 2017 +++ src/sys/arch/amd64/conf/GENERIC_KASLR Sun Oct 29 17:19:14 2017 @@ -1,6 +1,8 @@ -# $NetBSD: GENERIC_KASLR,v 1.2 2017/10/08 09:06:50 maxv Exp $ +# $NetBSD: GENERIC_KASLR,v 1.3 2017/10/29 17:19:14 maxv Exp $ include "arch/amd64/conf/GENERIC" +no options KDTRACE_HOOKS + makeoptions KASLR=1 # Kernel ASLR options KASLR
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: jmcneill Date: Thu Oct 19 23:59:56 UTC 2017 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: add bwfm To generate a diff of this commit: cvs rdiff -u -r1.466 -r1.467 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.466 src/sys/arch/amd64/conf/GENERIC:1.467 --- src/sys/arch/amd64/conf/GENERIC:1.466 Thu Sep 14 07:58:39 2017 +++ src/sys/arch/amd64/conf/GENERIC Thu Oct 19 23:59:56 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.466 2017/09/14 07:58:39 mrg Exp $ +# $NetBSD: GENERIC,v 1.467 2017/10/19 23:59:56 jmcneill Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.466 $" +#ident "GENERIC-$Revision: 1.467 $" maxusers 64 # estimated number of users @@ -1025,6 +1025,7 @@ run* at uhub? port ? # Ralink Technolog urtw* at uhub? port ? # Realtek RTL8187/RTL8187B 802.11b/g urtwn* at uhub? port ? # Realtek RTL8188CU/RTL8192CU 802.11b/g/n zyd* at uhub? port ? # Zydas ZD1211 +bwfm* at uhub? port ? # Broadcom FullMAC # USB scanners that use SCSI emulation, e.g., HP5300 usscanner* at uhub? port ?
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: maxv
Date: Sat Oct 7 10:16:47 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
Added Files:
src/sys/arch/amd64/conf: GENERIC_KASLR
Log Message:
Add GENERIC_KASLR, only toolchain parts for now.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/amd64/conf/GENERIC_KASLR
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/amd64/conf/Makefile.amd64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.58 src/sys/arch/amd64/conf/Makefile.amd64:1.59
--- src/sys/arch/amd64/conf/Makefile.amd64:1.58 Wed Aug 9 19:11:13 2017
+++ src/sys/arch/amd64/conf/Makefile.amd64 Sat Oct 7 10:16:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.58 2017/08/09 19:11:13 maxv Exp $
+# $NetBSD: Makefile.amd64,v 1.59 2017/10/07 10:16:47 maxv Exp $
# Makefile for NetBSD
#
@@ -61,7 +61,11 @@ KERN_AS= library
## (5) link settings
##
TEXTADDR?= 0x8020
+.if defined(KASLR)
+EXTRA_LINKFLAGS= -z max-page-size=0x20 -r -d
+.else
EXTRA_LINKFLAGS= -z max-page-size=0x20
+.endif
LINKFLAGS_NORMAL= -X
KERNLDSCRIPT?= ${AMD64}/conf/kern.ldscript
Added files:
Index: src/sys/arch/amd64/conf/GENERIC_KASLR
diff -u /dev/null src/sys/arch/amd64/conf/GENERIC_KASLR:1.1
--- /dev/null Sat Oct 7 10:16:47 2017
+++ src/sys/arch/amd64/conf/GENERIC_KASLR Sat Oct 7 10:16:47 2017
@@ -0,0 +1,5 @@
+# $NetBSD: GENERIC_KASLR,v 1.1 2017/10/07 10:16:47 maxv Exp $
+
+include "arch/amd64/conf/GENERIC"
+
+makeoptions KASLR=1 # Kernel ASLR
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: pgoyette
Date: Sat Sep 30 09:03:38 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0 XEN3_DOMU
Log Message:
Add commented-out ident lines to the XEN3_DOM{0,U} kernel config files
for consistency with other config files.
OK bouyer@
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/amd64/conf/XEN3_DOMU
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.139 src/sys/arch/amd64/conf/XEN3_DOM0:1.140
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.139 Thu Sep 14 07:58:39 2017
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Sep 30 09:03:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.139 2017/09/14 07:58:39 mrg Exp $
+# $NetBSD: XEN3_DOM0,v 1.140 2017/09/30 09:03:38 pgoyette Exp $
include "arch/amd64/conf/std.xen"
@@ -10,6 +10,8 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
+#ident "XEN3_DOM0-$Revision: 1.140 $"
+
maxusers 32 # estimated number of users
#
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.78 src/sys/arch/amd64/conf/XEN3_DOMU:1.79
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.78 Thu Sep 14 07:58:39 2017
+++ src/sys/arch/amd64/conf/XEN3_DOMU Sat Sep 30 09:03:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.78 2017/09/14 07:58:39 mrg Exp $
+# $NetBSD: XEN3_DOMU,v 1.79 2017/09/30 09:03:38 pgoyette Exp $
include "arch/amd64/conf/std.xen"
@@ -10,6 +10,8 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
+#ident "XEN3_DOMU-$Revision: 1.79 $"
+
maxusers 32 # estimated number of users
#
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maxv Date: Fri Jul 28 16:10:29 UTC 2017 Modified Files: src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 XEN3_DOMU Log Message: After a careful review, and all things considered, disable compat43 by default on amd64. The use case is limited, the potential for damage too high, and it is safer to run a BSD4.3 binary on i386 since the kernel does not have to go through netbsd32 - which may not correctly reproduce i386. To generate a diff of this commit: cvs rdiff -u -r1.461 -r1.462 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.136 -r1.137 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.75 -r1.76 src/sys/arch/amd64/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.461 src/sys/arch/amd64/conf/GENERIC:1.462 --- src/sys/arch/amd64/conf/GENERIC:1.461 Sat Jul 22 13:03:54 2017 +++ src/sys/arch/amd64/conf/GENERIC Fri Jul 28 16:10:28 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.461 2017/07/22 13:03:54 maxv Exp $ +# $NetBSD: GENERIC,v 1.462 2017/07/28 16:10:28 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.461 $" +#ident "GENERIC-$Revision: 1.462 $" maxusers 64 # estimated number of users @@ -132,7 +132,7 @@ options COMPAT_40 # NetBSD 4.0, options COMPAT_50 # NetBSD 5.0, options COMPAT_60 # NetBSD 6.0, and options COMPAT_70 # NetBSD 7.0 binary compatibility. -options COMPAT_43 # and 4.3BSD +#options COMPAT_43 # and 4.3BSD #options COMPAT_386BSD_MBRPART # recognize old partition ID options COMPAT_OSSAUDIO Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.136 src/sys/arch/amd64/conf/XEN3_DOM0:1.137 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.136 Thu Jun 22 18:14:32 2017 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Fri Jul 28 16:10:28 2017 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.136 2017/06/22 18:14:32 khorben Exp $ +# $NetBSD: XEN3_DOM0,v 1.137 2017/07/28 16:10:28 maxv Exp $ include "arch/amd64/conf/std.xen" @@ -62,7 +62,7 @@ makeoptions COPTS="-O2 -fno-omit-frame-p options DDB_COMMANDONENTER="trace;show registers" # Compatibility options -options COMPAT_43 # 4.3BSD binary compatibility. +#options COMPAT_43 # 4.3BSD binary compatibility. options COMPAT_15 # NetBSD 1.5, options COMPAT_16 # NetBSD 1.6, options COMPAT_20 # NetBSD 2.0, Index: src/sys/arch/amd64/conf/XEN3_DOMU diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.75 src/sys/arch/amd64/conf/XEN3_DOMU:1.76 --- src/sys/arch/amd64/conf/XEN3_DOMU:1.75 Sun May 21 06:19:37 2017 +++ src/sys/arch/amd64/conf/XEN3_DOMU Fri Jul 28 16:10:28 2017 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.75 2017/05/21 06:19:37 pgoyette Exp $ +# $NetBSD: XEN3_DOMU,v 1.76 2017/07/28 16:10:28 maxv Exp $ include "arch/amd64/conf/std.xen" @@ -54,7 +54,7 @@ makeoptions COPTS="-O2 -fno-omit-frame-p options DDB_COMMANDONENTER="trace;show registers" # Compatibility options -options COMPAT_43 # 4.3BSD binary compatibility. +#options COMPAT_43 # 4.3BSD binary compatibility. options COMPAT_15 # NetBSD 1.5, options COMPAT_16 # NetBSD 1.6, options COMPAT_20 # NetBSD 2.0, @@ -251,4 +251,3 @@ pseudo-device nsmb # experimental - SM # userland interface to drivers, including autoconf and properties retrieval pseudo-device drvctl -
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: riastradh Date: Fri Jul 28 15:40:38 UTC 2017 Modified Files: src/sys/arch/amd64/conf: ALL Log Message: Add some more bogus compat options to amd64/ALL for compile-testing. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/amd64/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.60 src/sys/arch/amd64/conf/ALL:1.61 --- src/sys/arch/amd64/conf/ALL:1.60 Wed Jun 14 09:00:07 2017 +++ src/sys/arch/amd64/conf/ALL Fri Jul 28 15:40:38 2017 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.60 2017/06/14 09:00:07 pgoyette Exp $ +# $NetBSD: ALL,v 1.61 2017/07/28 15:40:38 riastradh 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.60 $" +#ident "ALL-$Revision: 1.61 $" maxusers 64 # estimated number of users @@ -160,6 +160,11 @@ options COMPAT_IBCS2 # binary compatibi options COMPAT_FREEBSD # binary compatibility with FreeBSD options COMPAT_NDIS # NDIS network driver options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +options COMPAT_OSF1 # OSF1 binary compatibility +#options COMPAT_SVR4 # SVR4 binary compatibility (no amd64) +#options COMPAT_SVR4_32 # SVR4 32-bit binary compatibility (no amd64) +options COMPAT_ULTRIX # DEC Ultrix binary compatibility +options COMPAT_SUNOS # SunOS 4.x binary compatibility # Wedge support options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maxv Date: Sat Jul 22 13:03:54 UTC 2017 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add USER_LDT, commented out for now. To generate a diff of this commit: cvs rdiff -u -r1.460 -r1.461 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.460 src/sys/arch/amd64/conf/GENERIC:1.461 --- src/sys/arch/amd64/conf/GENERIC:1.460 Wed Jul 12 17:40:33 2017 +++ src/sys/arch/amd64/conf/GENERIC Sat Jul 22 13:03:54 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.460 2017/07/12 17:40:33 maxv Exp $ +# $NetBSD: GENERIC,v 1.461 2017/07/22 13:03:54 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.460 $" +#ident "GENERIC-$Revision: 1.461 $" maxusers 64 # estimated number of users @@ -73,6 +73,9 @@ options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel +# CPU-related options +#options USER_LDT # user-settable LDT; used by WINE + # CPU features acpicpu* at cpu? # ACPI CPU (including frequency scaling) coretemp* at cpu? # Intel on-die thermal sensor
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maxv Date: Wed Jun 14 07:45:45 UTC 2017 Modified Files: src/sys/arch/amd64/conf: kern.ldscript Log Message: Fix a pretty dumb mistake I made in r1.22: the alignment needs to be in the bss, otherwise the bootloader will use memory before __kernel_end and give a wrong start pa to the kernel. This issue was investigated by Anthony Mallet. Should fix PR/52000. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amd64/conf/kern.ldscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/kern.ldscript diff -u src/sys/arch/amd64/conf/kern.ldscript:1.22 src/sys/arch/amd64/conf/kern.ldscript:1.23 --- src/sys/arch/amd64/conf/kern.ldscript:1.22 Sat Feb 11 16:02:11 2017 +++ src/sys/arch/amd64/conf/kern.ldscript Wed Jun 14 07:45:45 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: kern.ldscript,v 1.22 2017/02/11 16:02:11 maxv Exp $ */ +/* $NetBSD: kern.ldscript,v 1.23 2017/06/14 07:45:45 maxv Exp $ */ #include "assym.h" @@ -63,10 +63,10 @@ SECTIONS *(.bss) *(.bss.*) *(COMMON) - . = ALIGN(64 / 8); + . = ALIGN(__LARGE_PAGE_SIZE); } - . = ALIGN(__LARGE_PAGE_SIZE); + . = ALIGN(__PAGE_SIZE); /* End of the kernel image */ __kernel_end = . ;
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: para Date: Thu May 25 05:54:29 UTC 2017 Modified Files: src/sys/arch/amd64/conf: ALL GENERIC Log Message: follow u3ginit driver rename to umodeswitch To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.457 -r1.458 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.57 src/sys/arch/amd64/conf/ALL:1.58 --- src/sys/arch/amd64/conf/ALL:1.57 Wed Apr 26 18:20:01 2017 +++ src/sys/arch/amd64/conf/ALL Thu May 25 05:54:29 2017 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.57 2017/04/26 18:20:01 christos Exp $ +# $NetBSD: ALL,v 1.58 2017/05/25 05:54:29 para 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.57 $" +#ident "ALL-$Revision: 1.58 $" maxusers 64 # estimated number of users @@ -1313,7 +1313,7 @@ radio* at udsbr? ugen* at uhub? port ? # USB 3G datacards -u3ginit* at uhub? port ? +umodeswitch* at uhub? port ? u3g* at uhub? port ? ucom* at u3g? Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.457 src/sys/arch/amd64/conf/GENERIC:1.458 --- src/sys/arch/amd64/conf/GENERIC:1.457 Tue Apr 18 19:09:12 2017 +++ src/sys/arch/amd64/conf/GENERIC Thu May 25 05:54:29 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.457 2017/04/18 19:09:12 riastradh Exp $ +# $NetBSD: GENERIC,v 1.458 2017/05/25 05:54:29 para Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.457 $" +#ident "GENERIC-$Revision: 1.458 $" maxusers 64 # estimated number of users @@ -1052,7 +1052,7 @@ radio* at udsbr? ugen* at uhub? port ? # USB 3G datacards -u3ginit* at uhub? port ? +umodeswitch* at uhub? port ? u3g* at uhub? port ? ucom* at u3g?
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: sborrill Date: Thu May 11 15:42:15 UTC 2017 Modified Files: src/sys/arch/amd64/conf: XEN3_DOMU Log Message: Add commented out carp and mpls pseudo-devices to be consistent with GENERIC To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/sys/arch/amd64/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOMU diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.73 src/sys/arch/amd64/conf/XEN3_DOMU:1.74 --- src/sys/arch/amd64/conf/XEN3_DOMU:1.73 Sun Feb 26 12:41:50 2017 +++ src/sys/arch/amd64/conf/XEN3_DOMU Thu May 11 15:42:15 2017 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.73 2017/02/26 12:41:50 rin Exp $ +# $NetBSD: XEN3_DOMU,v 1.74 2017/05/11 15:42:15 sborrill Exp $ include "arch/amd64/conf/std.xen" @@ -215,8 +215,10 @@ pseudo-device dm # device-mapper drive # network pseudo-devices pseudo-device bpfilter # Berkeley packet filter +#pseudo-device carp # Common Address Redundancy Protocol pseudo-device ipfilter # IP filter (firewall) and NAT pseudo-device loop # network loopback +#pseudo-device mpls # MPLS pseudo-interface pseudo-device ppp # Point-to-Point Protocol pseudo-device pppoe # PPP over Ethernet (RFC 2516) pseudo-device sl # Serial Line IP
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Wed Apr 26 18:20:01 UTC 2017 Modified Files: src/sys/arch/amd64/conf: ALL Log Message: Catch up with GENERIC changes. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/amd64/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.56 src/sys/arch/amd64/conf/ALL:1.57 --- src/sys/arch/amd64/conf/ALL:1.56 Tue Apr 18 15:09:12 2017 +++ src/sys/arch/amd64/conf/ALL Wed Apr 26 14:20:01 2017 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.56 2017/04/18 19:09:12 riastradh Exp $ +# $NetBSD: ALL,v 1.57 2017/04/26 18:20:01 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.56 $" +#ident "ALL-$Revision: 1.57 $" maxusers 64 # estimated number of users @@ -41,6 +41,13 @@ vmt0 at cpu0 # VMware Tools options PMC # performance-monitoring counters support +# Beep when it is safe to power down the system (requires sysbeep) +options BEEP_ONHALT +# Some tunable details of the above feature (default values used below) +options BEEP_ONHALT_COUNT=3 # Times to beep +options BEEP_ONHALT_PITCH=1500 # Default frequency (in Hz) +options BEEP_ONHALT_PERIOD=250 # Default duration (in msecs) + options MULTIBOOT # Multiboot support (see multiboot(8)) # delay between "rebooting ..." message and hardware reset, in milliseconds @@ -95,13 +102,6 @@ options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel -# Beep when it is safe to power down the system (requires sysbeep) -options BEEP_ONHALT -# Some tunable details of the above feature (default values used below) -options BEEP_ONHALT_COUNT=3 # Times to beep -options BEEP_ONHALT_PITCH=1500 # Default frequency (in Hz) -options BEEP_ONHALT_PERIOD=250 # Default duration (in msecs) - # Alternate buffer queue strategies for better responsiveness under high # disk I/O load. options BUFQ_READPRIO @@ -109,9 +109,11 @@ options BUFQ_PRIOCSCAN # Diagnostic/debugging support options options DIAGNOSTIC # inexpensive kernel consistency checks +# XXX to be commented out on release branch options DEBUG # expensive debugging checks/support options LOCKDEBUG # expensive locking checks/support options DDB # in-kernel debugger +options DDB_COMMANDONENTER="bt" # execute command when ddb is entered options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic' options DDB_HISTORY_SIZE=512 # enable history editing in DDB options DDB_VERBOSE_HELP @@ -119,6 +121,7 @@ options KGDB # remote debugger options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 #options IPKDB # IP Kernel Debugger #options IPKDBKEY="\"Pass_phrase_to_debug_over_network\"" +makeoptions COPTS="-O2 -fno-omit-frame-pointer" makeoptions DEBUG="-g" # compile full symbol table options SYSCALL_STATS # per syscall counts options SYSCALL_TIMES # per syscall times @@ -128,14 +131,15 @@ options UVMHIST # kernhist for uvm sub options BIOHIST # kernhist for buff I/O # Compatibility options -#options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI -#options COMPAT_09 # NetBSD 0.9, -#options COMPAT_10 # NetBSD 1.0, -#options COMPAT_11 # NetBSD 1.1, -#options COMPAT_12 # NetBSD 1.2 (and 386BSD and BSDI), -#options COMPAT_13 # NetBSD 1.3 (and 386BSD and BSDI), -#options COMPAT_14 # NetBSD 1.4, -#options COMPAT_15 # NetBSD 1.5, +options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI +options EXEC_AOUT # required by binaries from before 1.5 +options COMPAT_09 # NetBSD 0.9, +options COMPAT_10 # NetBSD 1.0, +options COMPAT_11 # NetBSD 1.1, +options COMPAT_12 # NetBSD 1.2 (and 386BSD and BSDI), +options COMPAT_13 # NetBSD 1.3 (and 386BSD and BSDI), +options COMPAT_14 # NetBSD 1.4, +options COMPAT_15 # NetBSD 1.5, options COMPAT_16 # NetBSD 1.6, options COMPAT_20 # NetBSD 2.0, options COMPAT_30 # NetBSD 3.0, @@ -148,11 +152,11 @@ options COMPAT_44 # 4.4BSD options COMPAT_386BSD_MBRPART # recognize old partition ID options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -options COMPAT_NETBSD32 # NetBSD 32-bit options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility -options COMPAT_IBCS2 # binary compatibility with SCO and ISC +options COMPAT_NETBSD32 # NetBSD 32-bit options COMPAT_LINUX # binary compatibility with Linux options COMPAT_LINUX32 # binary compatibility with Linux 32-bit +options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_FREEBSD # binary compatibility with FreeBSD options COMPAT_NDIS # NDIS network driver options COMPAT_BSDPTY #
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: msaitoh Date: Thu Apr 20 09:56:27 UTC 2017 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: Add ixg(4). Fixes PR#52180 from Harry Waddell. XXX pullup to netbsd-7 To generate a diff of this commit: cvs rdiff -u -r1.134 -r1.135 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.134 src/sys/arch/amd64/conf/XEN3_DOM0:1.135 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.134 Mon Apr 17 09:54:59 2017 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Thu Apr 20 09:56:27 2017 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.134 2017/04/17 09:54:59 bouyer Exp $ +# $NetBSD: XEN3_DOM0,v 1.135 2017/04/20 09:56:27 msaitoh Exp $ include "arch/amd64/conf/std.xen" @@ -369,6 +369,7 @@ ipw* at pci? dev ? function ? # Intel PR iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN iwm* at pci? dev ? function ? # Intel Wireless WiFi Link 7xxx +ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit jme* at pci? dev ? function ? # JMicron JMC2[56]0 ethernet le* at pci? dev ? function ? # PCnet-PCI Ethernet lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Sun Mar 5 17:20:25 UTC 2017 Modified Files: src/sys/arch/amd64/conf: MODULAR Log Message: use the modular versions of spkr To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amd64/conf/MODULAR Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/MODULAR diff -u src/sys/arch/amd64/conf/MODULAR:1.7 src/sys/arch/amd64/conf/MODULAR:1.8 --- src/sys/arch/amd64/conf/MODULAR:1.7 Sat Feb 18 14:28:44 2017 +++ src/sys/arch/amd64/conf/MODULAR Sun Mar 5 12:20:24 2017 @@ -1,4 +1,4 @@ -# $NetBSD: MODULAR,v 1.7 2017/02/18 19:28:44 christos Exp $ +# $NetBSD: MODULAR,v 1.8 2017/03/05 17:20:24 christos Exp $ # # Try to exclude all the drivers in GENERIC that have been modularized # XXX: incomplete @@ -12,6 +12,9 @@ options MODULAR_DEFAULT_AUTOLOAD -no powernow0 at cpu0 -no vmt0 at cpu0 +-no spkr* at pcppi? # PC speaker +-no spkr* at audio? # PC speaker (synthesized) + -no options COMPAT_15 # NetBSD 1.5, -no options COMPAT_16 # NetBSD 1.6, -no options COMPAT_20 # NetBSD 2.0,
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Sat Feb 18 19:28:44 UTC 2017 Modified Files: src/sys/arch/amd64/conf: MODULAR Log Message: l2tp is a module To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amd64/conf/MODULAR Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/MODULAR diff -u src/sys/arch/amd64/conf/MODULAR:1.6 src/sys/arch/amd64/conf/MODULAR:1.7 --- src/sys/arch/amd64/conf/MODULAR:1.6 Sat Dec 17 23:35:26 2016 +++ src/sys/arch/amd64/conf/MODULAR Sat Feb 18 14:28:44 2017 @@ -1,4 +1,4 @@ -# $NetBSD: MODULAR,v 1.6 2016/12/18 04:35:26 dholland Exp $ +# $NetBSD: MODULAR,v 1.7 2017/02/18 19:28:44 christos Exp $ # # Try to exclude all the drivers in GENERIC that have been modularized # XXX: incomplete @@ -116,6 +116,7 @@ options MODULAR_DEFAULT_AUTOLOAD -no pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation -no pseudo-device vlan # IEEE 802.1q encapsulation -no pseudo-device agr # IEEE 802.3ad link aggregation +-no pseudo-device l2tp # L2TPv3 interface -no pseudo-device npf # NPF packet filter #
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: knakahara Date: Thu Feb 16 08:45:43 UTC 2017 Modified Files: src/sys/arch/amd64/conf: ALL GENERIC Log Message: add l2tp(4) to amd64/GENERIC and amd64/ALL config. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.450 -r1.451 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.49 src/sys/arch/amd64/conf/ALL:1.50 --- src/sys/arch/amd64/conf/ALL:1.49 Thu Jan 12 05:24:36 2017 +++ src/sys/arch/amd64/conf/ALL Thu Feb 16 08:45:42 2017 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.49 2017/01/12 05:24:36 ryo Exp $ +# $NetBSD: ALL,v 1.50 2017/02/16 08:45:42 knakahara 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.49 $" +#ident "ALL-$Revision: 1.50 $" maxusers 64 # estimated number of users @@ -1573,6 +1573,7 @@ pseudo-device vlan # IEEE 802.1q encap pseudo-device bridge # simple inter-network bridging options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too pseudo-device agr # IEEE 802.3ad link aggregation +pseudo-device l2tp # L2TPv3 interface #pseudo-device pf # PF packet filter #pseudo-device pflog # PF log if #pseudo-device pfsync # PF sync if Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.450 src/sys/arch/amd64/conf/GENERIC:1.451 --- src/sys/arch/amd64/conf/GENERIC:1.450 Thu Jan 12 05:24:36 2017 +++ src/sys/arch/amd64/conf/GENERIC Thu Feb 16 08:45:42 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.450 2017/01/12 05:24:36 ryo Exp $ +# $NetBSD: GENERIC,v 1.451 2017/02/16 08:45:42 knakahara Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.450 $" +#ident "GENERIC-$Revision: 1.451 $" maxusers 64 # estimated number of users @@ -1271,6 +1271,7 @@ pseudo-device vlan # IEEE 802.1q encap pseudo-device bridge # simple inter-network bridging #options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too pseudo-device agr # IEEE 802.3ad link aggregation +pseudo-device l2tp # L2TPv3 interface #pseudo-device pf # PF packet filter #pseudo-device pflog # PF log if #pseudo-device pfsync # PF sync if
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: maxv
Date: Sat Feb 11 16:02:11 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64 kern.ldscript
Log Message:
Put 2MB alignments between the kernel segments. This way the kernel image
is entirely mapped with large pages, which uniformizes performance and
reduces fluctuation. Sent on port-amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amd64/conf/kern.ldscript
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.56 src/sys/arch/amd64/conf/Makefile.amd64:1.57
--- src/sys/arch/amd64/conf/Makefile.amd64:1.56 Thu Feb 2 19:09:08 2017
+++ src/sys/arch/amd64/conf/Makefile.amd64 Sat Feb 11 16:02:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.56 2017/02/02 19:09:08 maxv Exp $
+# $NetBSD: Makefile.amd64,v 1.57 2017/02/11 16:02:11 maxv Exp $
# Makefile for NetBSD
#
@@ -61,7 +61,7 @@ KERN_AS= library
## (5) link settings
##
TEXTADDR?= 0x8020
-EXTRA_LINKFLAGS= -z max-page-size=0x10
+EXTRA_LINKFLAGS= -z max-page-size=0x20
LINKFLAGS_NORMAL= -X
KERNLDSCRIPT?= ${AMD64}/conf/kern.ldscript
Index: src/sys/arch/amd64/conf/kern.ldscript
diff -u src/sys/arch/amd64/conf/kern.ldscript:1.21 src/sys/arch/amd64/conf/kern.ldscript:1.22
--- src/sys/arch/amd64/conf/kern.ldscript:1.21 Thu May 12 09:05:16 2016
+++ src/sys/arch/amd64/conf/kern.ldscript Sat Feb 11 16:02:11 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.21 2016/05/12 09:05:16 maxv Exp $ */
+/* $NetBSD: kern.ldscript,v 1.22 2017/02/11 16:02:11 maxv Exp $ */
#include "assym.h"
@@ -35,7 +35,7 @@ SECTIONS
*(.rodata.*)
}
- . = ALIGN(__PAGE_SIZE);
+ . = ALIGN(__LARGE_PAGE_SIZE);
__data_start = . ;
.data :
@@ -66,7 +66,7 @@ SECTIONS
. = ALIGN(64 / 8);
}
- . = ALIGN(__PAGE_SIZE);
+ . = ALIGN(__LARGE_PAGE_SIZE);
/* End of the kernel image */
__kernel_end = . ;
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Mon Jan 23 17:35:34 UTC 2017 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 XEN3_DOMU Log Message: PR/51908: Kyle Amon: Allow customization of XEN kernels via .local files. To generate a diff of this commit: cvs rdiff -u -r1.127 -r1.128 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.68 -r1.69 src/sys/arch/amd64/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.127 src/sys/arch/amd64/conf/XEN3_DOM0:1.128 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.127 Thu Jan 12 00:24:36 2017 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Mon Jan 23 12:35:34 2017 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.127 2017/01/12 05:24:36 ryo Exp $ +# $NetBSD: XEN3_DOM0,v 1.128 2017/01/23 17:35:34 christos Exp $ include "arch/amd64/conf/std.xen" @@ -802,6 +802,7 @@ hifn* at pci? dev ? function ? # Hifn 77 ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x cinclude "arch/amd64/conf/GENERIC.local" +cinclude "arch/amd64/conf/XEN3_DOM0.local" # Pseudo-Devices Index: src/sys/arch/amd64/conf/XEN3_DOMU diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.68 src/sys/arch/amd64/conf/XEN3_DOMU:1.69 --- src/sys/arch/amd64/conf/XEN3_DOMU:1.68 Thu Jan 12 00:24:36 2017 +++ src/sys/arch/amd64/conf/XEN3_DOMU Mon Jan 23 12:35:34 2017 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.68 2017/01/12 05:24:36 ryo Exp $ +# $NetBSD: XEN3_DOMU,v 1.69 2017/01/23 17:35:34 christos Exp $ include "arch/amd64/conf/std.xen" @@ -180,6 +180,7 @@ xencons* at hypervisor? # Xen virtual c # you then need to add your PCI devices drivers below. cinclude "arch/amd64/conf/GENERIC.local" +cinclude "arch/amd64/conf/XEN3_DOMU.local" # Pseudo-Devices
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Sat Dec 31 15:41:40 UTC 2016 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add commented out TCP_SIGNATURE To generate a diff of this commit: cvs rdiff -u -r1.448 -r1.449 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.448 src/sys/arch/amd64/conf/GENERIC:1.449 --- src/sys/arch/amd64/conf/GENERIC:1.448 Sat Dec 17 23:35:26 2016 +++ src/sys/arch/amd64/conf/GENERIC Sat Dec 31 10:41:39 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.448 2016/12/18 04:35:26 dholland Exp $ +# $NetBSD: GENERIC,v 1.449 2016/12/31 15:41:39 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.448 $" +#ident "GENERIC-$Revision: 1.449 $" maxusers 64 # estimated number of users @@ -201,6 +201,7 @@ options IPFILTER_LOOKUP # ippool(8) sup options IPFILTER_COMPAT # Compat for IP-Filter #options IPFILTER_DEFAULT_BLOCK # block all packets by default #options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG +#options TCP_SIGNATURE # Enable RFC-2385 TCP md5 signatures #options ALTQ # Manipulate network interfaces' output queues #options ALTQ_BLUE # Stochastic Fair Blue
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: dholland Date: Sun Dec 18 04:35:26 UTC 2016 Modified Files: src/sys/arch/amd64/conf: ALL GENERIC GENERIC_USERMODE INSTALL MODULAR XEN3_DOM0 XEN3_DOMU Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.447 -r1.448 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amd64/conf/GENERIC_USERMODE cvs rdiff -u -r1.90 -r1.91 src/sys/arch/amd64/conf/INSTALL cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amd64/conf/MODULAR cvs rdiff -u -r1.124 -r1.125 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.66 -r1.67 src/sys/arch/amd64/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.45 src/sys/arch/amd64/conf/ALL:1.46 --- src/sys/arch/amd64/conf/ALL:1.45 Thu Dec 15 04:01:09 2016 +++ src/sys/arch/amd64/conf/ALL Sun Dec 18 04:35:26 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.45 2016/12/15 04:01:09 ozaki-r Exp $ +# $NetBSD: ALL,v 1.46 2016/12/18 04:35:26 dholland 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.45 $" +#ident "ALL-$Revision: 1.46 $" maxusers 64 # estimated number of users @@ -208,7 +208,7 @@ options LFS_EXTATTR # extended attribut options LFS_QUOTA # quotas for LFS - experimental options LFS_QUOTA2 # new-style quotas for LFS - experimental options NFSSERVER # Network File System server -#options FFS_NO_SNAPSHOT # No FFS snapshot support +#options FFS_NO_SNAPSHOT # No FFS snapshot support options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and # immutable) behave as system flags. options V7FS_EI # V7FS Endian Independent support @@ -233,7 +233,7 @@ options IPFILTER_COMPAT # Compat for IP options IPFILTER_DEFAULT_BLOCK # block all packets by default options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG options TCP_SIGNATURE # RFC 2385 support, used with BGP -options SCTP # Stream Control Transmission Protocol +options SCTP # Stream Control Transmission Protocol options ALTQ # Manipulate network interfaces' output queues options ALTQ_BLUE # Stochastic Fair Blue @@ -382,7 +382,7 @@ com* at acpi? # Serial communications fdc* at acpi? # Floppy disk controller fujbp* at acpi? # Fujitsu Brightness & Pointer fujhk* at acpi? # Fujitsu Hotkeys -hpacel* at acpi? # HP 3D DriveGuard accelerometer +hpacel* at acpi? # HP 3D DriveGuard accelerometer hpqlb* at acpi? # HP Quick Launch Buttons hpet* at acpihpetbus? # High Precision Event Timer (table) hpet* at acpinodebus? # High Precision Event Timer (device) @@ -442,7 +442,7 @@ options PCI_INTR_FIXUP # fixup PCI int # Temperatures amdnb_misc* at pci? # AMD NB Misc Configuration -amdtemp* at amdnb_misc? # AMD CPU Temperature sensors +amdtemp* at amdnb_misc? # AMD CPU Temperature sensors # PCI bridges amdpcib* at pci? dev ? function ? # AMD 8111 PCI-ISA w/ HPET @@ -1181,7 +1181,7 @@ cue* at uhub? port ? # CATC USB-EL1201A kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters udav* at uhub? port ? # Davicom DM9601 based adapters url* at uhub? port ? # Realtek RTL8150L based adapters -urndis* at uhub? port ? # Microsoft RNDIS specification +urndis* at uhub? port ? # Microsoft RNDIS specification # USB 802.11 adapters atu* at uhub? port ? # Atmel AT76C50XX based adapters @@ -1504,7 +1504,7 @@ satlink0 at isa? port 0x300 drq 1 weasel* at pci? # Virtio devices -virtio* at pci? dev ? function ? # Virtio PCI device +virtio* at pci? dev ? function ? # Virtio PCI device viomb* at virtio? # Virtio memory balloon device ld* at virtio? # Virtio disk device vioif* at virtio? # Virtio network device Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.447 src/sys/arch/amd64/conf/GENERIC:1.448 --- src/sys/arch/amd64/conf/GENERIC:1.447 Tue Dec 13 20:42:16 2016 +++ src/sys/arch/amd64/conf/GENERIC Sun Dec 18 04:35:26 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.447 2016/12/13 20:42:16 christos Exp $ +# $NetBSD: GENERIC,v 1.448 2016/12/18 04:35:26 dholland Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.447 $" +#ident "GENERIC-$Revision: 1.448 $" maxusers 64 # estimated number of users @@ -60,7 +60,7 @@ options NTP # NTP phase/frequency lock options KTRACE # system call tracing via ktrace(1) -options CPU_UCODE # cpu ucode loading support +options CPU_UCODE # cpu ucode loading support # Note: SysV IPC parameters could be
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Fri Dec 9 02:23:25 UTC 2016 Modified Files: src/sys/arch/amd64/conf: ALL GENERIC Log Message: kill PCPPISPEAKER To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.444 -r1.445 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.41 src/sys/arch/amd64/conf/ALL:1.42 --- src/sys/arch/amd64/conf/ALL:1.41 Thu Dec 8 06:31:09 2016 +++ src/sys/arch/amd64/conf/ALL Thu Dec 8 21:23:25 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.41 2016/12/08 11:31:09 nat Exp $ +# $NetBSD: ALL,v 1.42 2016/12/09 02:23:25 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/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.41 $" +#ident "ALL-$Revision: 1.42 $" maxusers 64 # estimated number of users @@ -1375,7 +1375,6 @@ midi* at midibus? midi* at pcppi? # MIDI interface to the PC speaker # The spkr driver provides a simple tone interface to the built in speaker. -options PCPPISPEAKER spkr0 at pcppi? # PC speaker #options VAUDIOSPEAKER Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.444 src/sys/arch/amd64/conf/GENERIC:1.445 --- src/sys/arch/amd64/conf/GENERIC:1.444 Thu Dec 8 06:31:09 2016 +++ src/sys/arch/amd64/conf/GENERIC Thu Dec 8 21:23:25 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.444 2016/12/08 11:31:09 nat Exp $ +# $NetBSD: GENERIC,v 1.445 2016/12/09 02:23:25 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.444 $" +#ident "GENERIC-$Revision: 1.445 $" maxusers 64 # estimated number of users @@ -1109,7 +1109,6 @@ hdafg* at hdaudiobus? audio* at audiobus? # The spkr driver provides a simple tone interface to the built in speaker. -options PCPPISPEAKER spkr0 at pcppi? # PC speaker #options VAUDIOSPEAKER
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: dholland Date: Sat Nov 26 01:09:33 UTC 2016 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: 1.6 was the first amd64 release. (although it didn't really work too well before -5) To generate a diff of this commit: cvs rdiff -u -r1.441 -r1.442 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.441 src/sys/arch/amd64/conf/GENERIC:1.442 --- src/sys/arch/amd64/conf/GENERIC:1.441 Sat Nov 26 00:34:01 2016 +++ src/sys/arch/amd64/conf/GENERIC Sat Nov 26 01:09:33 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.441 2016/11/26 00:34:01 dholland Exp $ +# $NetBSD: GENERIC,v 1.442 2016/11/26 01:09:33 dholland Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.441 $" +#ident "GENERIC-$Revision: 1.442 $" maxusers 64 # estimated number of users @@ -110,7 +110,7 @@ makeoptions DEBUG="-g" # compile full sy options KDTRACE_HOOKS # kernel DTrace hooks # Compatibility options -# (note that really old compat is only useful for 32-bit binaries) +# (note that really old compat (< 1.6) is only useful for 32-bit binaries) #options EXEC_AOUT # required by binaries from before 1.5 #options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI #options COMPAT_09 # NetBSD 0.9,
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: dholland Date: Sat Nov 26 00:34:01 UTC 2016 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Note that really old compat is only useful for running 32-bit binaries. XXX: someone please indicate what the oldest possible extant x86_64 binaries are; I can't find an authoritative source. To generate a diff of this commit: cvs rdiff -u -r1.440 -r1.441 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.440 src/sys/arch/amd64/conf/GENERIC:1.441 --- src/sys/arch/amd64/conf/GENERIC:1.440 Fri Nov 25 23:33:46 2016 +++ src/sys/arch/amd64/conf/GENERIC Sat Nov 26 00:34:01 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.440 2016/11/25 23:33:46 dholland Exp $ +# $NetBSD: GENERIC,v 1.441 2016/11/26 00:34:01 dholland Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.440 $" +#ident "GENERIC-$Revision: 1.441 $" maxusers 64 # estimated number of users @@ -110,6 +110,7 @@ makeoptions DEBUG="-g" # compile full sy options KDTRACE_HOOKS # kernel DTrace hooks # Compatibility options +# (note that really old compat is only useful for 32-bit binaries) #options EXEC_AOUT # required by binaries from before 1.5 #options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI #options COMPAT_09 # NetBSD 0.9,
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: dholland Date: Fri Nov 25 23:33:46 UTC 2016 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: fileassoc is used by PaX as well as veriexec - update note accordingly. To generate a diff of this commit: cvs rdiff -u -r1.439 -r1.440 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.439 src/sys/arch/amd64/conf/GENERIC:1.440 --- src/sys/arch/amd64/conf/GENERIC:1.439 Fri Nov 25 23:15:28 2016 +++ src/sys/arch/amd64/conf/GENERIC Fri Nov 25 23:33:46 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.439 2016/11/25 23:15:28 dholland Exp $ +# $NetBSD: GENERIC,v 1.440 2016/11/25 23:33:46 dholland Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.439 $" +#ident "GENERIC-$Revision: 1.440 $" maxusers 64 # estimated number of users @@ -1306,7 +1306,7 @@ pseudo-device pad # userland interface to drivers, including autoconf and properties retrieval pseudo-device drvctl -options FILEASSOC # fileassoc(9) - required for Veriexec +options FILEASSOC # fileassoc(9) - needed by Veriexec/PaX # Veriexec #
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: dholland Date: Fri Nov 25 23:15:28 UTC 2016 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: sort iwm* before iwn* To generate a diff of this commit: cvs rdiff -u -r1.438 -r1.439 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.438 src/sys/arch/amd64/conf/GENERIC:1.439 --- src/sys/arch/amd64/conf/GENERIC:1.438 Fri Nov 25 23:06:58 2016 +++ src/sys/arch/amd64/conf/GENERIC Fri Nov 25 23:15:28 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.438 2016/11/25 23:06:58 dholland Exp $ +# $NetBSD: GENERIC,v 1.439 2016/11/25 23:15:28 dholland Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.438 $" +#ident "GENERIC-$Revision: 1.439 $" maxusers 64 # estimated number of users @@ -750,8 +750,8 @@ fxp* at pci? dev ? function ? # Intel Et gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG -iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN iwm* at pci? dev ? function ? # Intel Centrino 7260 +iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit ixv* at pci? dev ? function ? # Intel 8259x 10G virtual function jme* at pci? dev ? function ? # JMicron JMC2[56]0 ethernet
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: dholland Date: Fri Nov 25 23:06:58 UTC 2016 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: The compat options should all be in one block. To generate a diff of this commit: cvs rdiff -u -r1.437 -r1.438 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.437 src/sys/arch/amd64/conf/GENERIC:1.438 --- src/sys/arch/amd64/conf/GENERIC:1.437 Sun Aug 7 10:44:05 2016 +++ src/sys/arch/amd64/conf/GENERIC Fri Nov 25 23:06:58 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.437 2016/08/07 10:44:05 christos Exp $ +# $NetBSD: GENERIC,v 1.438 2016/11/25 23:06:58 dholland Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.437 $" +#ident "GENERIC-$Revision: 1.438 $" maxusers 64 # estimated number of users @@ -110,6 +110,14 @@ makeoptions DEBUG="-g" # compile full sy options KDTRACE_HOOKS # kernel DTrace hooks # Compatibility options +#options EXEC_AOUT # required by binaries from before 1.5 +#options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI +#options COMPAT_09 # NetBSD 0.9, +#options COMPAT_10 # NetBSD 1.0, +#options COMPAT_11 # NetBSD 1.1, +#options COMPAT_12 # NetBSD 1.2 (and 386BSD and BSDI), +#options COMPAT_13 # NetBSD 1.3 (and 386BSD and BSDI), +#options COMPAT_14 # NetBSD 1.4, options COMPAT_15 # NetBSD 1.5, options COMPAT_16 # NetBSD 1.6, options COMPAT_20 # NetBSD 2.0, @@ -128,16 +136,6 @@ options COMPAT_LINUX32 # req. COMPAT_LI options EXEC_ELF32 options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. -# The following options are for running i386 binaries for pre-1.6 -#options EXEC_AOUT -#options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI -#options COMPAT_09 # NetBSD 0.9, -#options COMPAT_10 # NetBSD 1.0, -#options COMPAT_11 # NetBSD 1.1, -#options COMPAT_12 # NetBSD 1.2 (and 386BSD and BSDI), -#options COMPAT_13 # NetBSD 1.3 (and 386BSD and BSDI), -#options COMPAT_14 # NetBSD 1.4, - # Wedge support options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
