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 changed dynamically, see sysctl(8).
options SYSVMSG # System V-like message queues
@@ -111,7 +111,7 @@ options KDTRACE_HOOKS # kernel DTrace h
# Compatibility options
# (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 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,
@@ -142,7 +142,7 @@ options DKWEDGE_AUTODISCOVER # Automati
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
-options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
+options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
# File systems
file-system FFS # UFS
@@ -309,7 +309,7 @@ attimer* at acpi? # AT Timer
#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)
@@ -407,7 +407,7 @@ sysbeep0 at pcppi?
#savagedrm* at drm? # S3 Savage DRM driver
#sisdrm* at drm? # SiS DRM driver
#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
-#viadrm* at drm? # VIA DRM driver
+#viadrm* at drm? # VIA DRM driver
# DRMKMS drivers
i915drmkms* at pci? dev ? function ?
@@ -465,7 +465,7 @@ lpt1 at isa? port 0x278
# Hardware monitors
amdnb_misc* at pci? # AMD NB Misc Configuration
-amdtemp* at amdnb_misc? # AMD CPU Temperature sensors
+amdtemp* at amdnb_misc? # AMD CPU Temperature sensors
# Winbond LPC Super I/O
#wbsio* at isa? port 0x2e
@@ -553,8 +553,8 @@ ld* at iop? tid ? # block devices
gpio* at gpiobus?
# 1- Wire support
-#gpioow* at gpio? offset ? mask ? # 1-wire bitbanging via gpio
-gpioow* at gpio?
+#gpioow* at gpio? offset ? mask ? # 1-wire bitbanging via gpio
+gpioow* at gpio?
onewire* at gpioow?
# I2C support
@@ -669,7 +669,7 @@ wdc* at pcmcia? function ?
# CardBus IDE controllers
njata* at cardbus? function ? flags 0x01 # Workbit NinjaATA-32
-siisata* at cardbus? function ? # SiI SteelVine controllers
+siisata* at cardbus? function ? # SiI SteelVine controllers
# ISA ST506, ESDI, and IDE controllers
# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
@@ -847,7 +847,7 @@ iophy* at mii? phy ? # Intel 82553 PHY
lxtphy* at mii? phy ? # Level One LXT-970 PHYs
makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
-nsphyter* at mii? phy ? # NS83843 PHYs
+nsphyter* at mii? phy ? # NS83843 PHYs
pnaphy* at mii? phy ? # generic HomePNA PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
rgephy* at mii? phy ? # Realtek 8169S/8110 internal PHYs
@@ -970,7 +970,7 @@ kue* at uhub? port ? # Kawasaki LSI KL5
#mos* at uhub? port ? # Moschip MCS7730/MCS7830/MCS7832 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
# Prolific PL2301/PL2302 host-to-host adapter
upl* at uhub? port ?
@@ -991,13 +991,13 @@ ucom* at uipaq? portno ?
umct* at uhub? port ? # MCT USB-RS232 serial adapter
ucom* at umct? portno ?
-uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
+uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
ucom* at uplcom? portno ?
uslsa* at uhub? port ? # Silicon Labs USB-RS232 serial adapter
ucom* at uslsa? portno ?
-uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter
+uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter
ucom* at uvscom? portno ?
# RIM BlackBerry
@@ -1208,11 +1208,11 @@ ld* at sdmmc?
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
-viornd* at virtio? # Virtio entropy device
+viornd* at virtio? # Virtio entropy device
vioscsi* at virtio? # Virtio SCSI device
# Pull in optional local configuration
Index: src/sys/arch/amd64/conf/GENERIC_USERMODE
diff -u src/sys/arch/amd64/conf/GENERIC_USERMODE:1.1 src/sys/arch/amd64/conf/GENERIC_USERMODE:1.2
--- src/sys/arch/amd64/conf/GENERIC_USERMODE:1.1 Sat Jun 30 15:03:57 2012
+++ src/sys/arch/amd64/conf/GENERIC_USERMODE Sun Dec 18 04:35:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_USERMODE,v 1.1 2012/06/30 15:03:57 reinoud Exp $
+# $NetBSD: GENERIC_USERMODE,v 1.2 2016/12/18 04:35:26 dholland Exp $
machine usermode
include "arch/usermode/conf/GENERIC.common"
@@ -8,13 +8,13 @@ no options EXEC_ELF32
options INSECURE # required by sysinst
-options TEXTADDR=0x40000000 # 1 Gb `phys ram' / total space
-options KVMSIZE= 0x10000000 # KVM space reserved in VM map, 256 Mb
-options NKMEMPAGES_MAX=32768 # 128 Mb max
+options TEXTADDR=0x40000000 # 1 Gb `phys ram' / total space
+options KVMSIZE= 0x10000000 # KVM space reserved in VM map, 256 Mb
+options NKMEMPAGES_MAX=32768 # 128 Mb max
makeoptions COPTS+="-m64"
makeoptions LD="ld -melf_amd64"
#options INCLUDE_CONFIG_FILE
-#ident "GENERIC32-$Revision: 1.1 $"
+#ident "GENERIC32-$Revision: 1.2 $"
Index: src/sys/arch/amd64/conf/INSTALL
diff -u src/sys/arch/amd64/conf/INSTALL:1.90 src/sys/arch/amd64/conf/INSTALL:1.91
--- src/sys/arch/amd64/conf/INSTALL:1.90 Sun Nov 2 23:12:00 2014
+++ src/sys/arch/amd64/conf/INSTALL Sun Dec 18 04:35:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.90 2014/11/02 23:12:00 christos Exp $
+# $NetBSD: INSTALL,v 1.91 2016/12/18 04:35:26 dholland Exp $
#
# INSTALL - Installation kernel.
#
@@ -7,8 +7,8 @@
include "arch/amd64/conf/GENERIC"
-options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=115200
-#ident "INSTALL-$Revision: 1.90 $"
+options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=115200
+#ident "INSTALL-$Revision: 1.91 $"
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
Index: src/sys/arch/amd64/conf/MODULAR
diff -u src/sys/arch/amd64/conf/MODULAR:1.5 src/sys/arch/amd64/conf/MODULAR:1.6
--- src/sys/arch/amd64/conf/MODULAR:1.5 Fri Sep 9 21:10:56 2016
+++ src/sys/arch/amd64/conf/MODULAR Sun Dec 18 04:35:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: MODULAR,v 1.5 2016/09/09 21:10:56 christos Exp $
+# $NetBSD: MODULAR,v 1.6 2016/12/18 04:35:26 dholland Exp $
#
# Try to exclude all the drivers in GENERIC that have been modularized
# XXX: incomplete
@@ -35,26 +35,26 @@ options MODULAR_DEFAULT_AUTOLOAD
-no options SYSVSHM # System V-like memory sharing
# XXX: for now
-#no file-system FFS # UFS
--no file-system MFS # memory file system
--no file-system NFS # Network File System client
--no file-system TMPFS # Efficient memory file-system
--no file-system EXT2FS # second extended file system (linux)
--no file-system LFS # log-structured file system
--no file-system NTFS # Windows/NT file system (experimental)
--no file-system CD9660 # ISO 9660 + Rock Ridge file system
--no file-system MSDOSFS # MS-DOS file system
--no file-system FDESC # /dev/fd
--no file-system KERNFS # /kern
--no file-system NULLFS # loopback file system
--no file-system OVERLAY # overlay file system
--no file-system PROCFS # /proc
--no file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
--no file-system SMBFS # experimental - CIFS; also needs nsmb (below)
--no file-system UMAPFS # NULLFS + uid and gid remapping
--no file-system UNION # union file system
--no file-system CODA # Coda File System; also needs vcoda (below)
--no file-system PTYFS # /dev/ptm support
+#no file-system FFS # UFS
+-no file-system MFS # memory file system
+-no file-system NFS # Network File System client
+-no file-system TMPFS # Efficient memory file-system
+-no file-system EXT2FS # second extended file system (linux)
+-no file-system LFS # log-structured file system
+-no file-system NTFS # Windows/NT file system (experimental)
+-no file-system CD9660 # ISO 9660 + Rock Ridge file system
+-no file-system MSDOSFS # MS-DOS file system
+-no file-system FDESC # /dev/fd
+-no file-system KERNFS # /kern
+-no file-system NULLFS # loopback file system
+-no file-system OVERLAY # overlay file system
+-no file-system PROCFS # /proc
+-no file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
+-no file-system SMBFS # experimental - CIFS; also needs nsmb (below)
+-no file-system UMAPFS # NULLFS + uid and gid remapping
+-no file-system UNION # union file system
+-no file-system CODA # Coda File System; also needs vcoda (below)
+-no file-system PTYFS # /dev/ptm support
-no options PPP_BSDCOMP # BSD-Compress compression support for PPP
-no options PPP_DEFLATE # Deflate compression support for PPP
@@ -84,7 +84,7 @@ options MODULAR_DEFAULT_AUTOLOAD
-no alc* at pci?
-no ath* at pci?
--no select sppp # Synchronous-Point-to-Point Protocol
+-no select sppp # Synchronous-Point-to-Point Protocol
-no pseudo-device crypto # /dev/crypto device
-no pseudo-device swcrypto # software crypto implementation
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.124 src/sys/arch/amd64/conf/XEN3_DOM0:1.125
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.124 Sat Dec 17 14:49:26 2016
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sun Dec 18 04:35:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.124 2016/12/17 14:49:26 maxv Exp $
+# $NetBSD: XEN3_DOM0,v 1.125 2016/12/18 04:35:26 dholland Exp $
include "arch/amd64/conf/std.xen"
@@ -34,7 +34,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
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
@@ -83,7 +83,7 @@ options DKWEDGE_AUTODISCOVER # Automati
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
-options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
+options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
# File systems
file-system FFS # UFS
@@ -296,7 +296,7 @@ lpt0 at isa? port 0x378 irq 7 # standard
# Hardware monitors
amdnb_misc* at pci? # AMD NB Misc Configuration
-amdtemp* at amdnb_misc? # AMD CPU Temperature sensors
+amdtemp* at amdnb_misc? # AMD CPU Temperature sensors
# AMD 768 and 8111 power/ACPI controllers
amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
@@ -649,7 +649,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
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.66 src/sys/arch/amd64/conf/XEN3_DOMU:1.67
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.66 Sat Dec 17 14:49:26 2016
+++ src/sys/arch/amd64/conf/XEN3_DOMU Sun Dec 18 04:35:26 2016
@@ -1,8 +1,8 @@
-# $NetBSD: XEN3_DOMU,v 1.66 2016/12/17 14:49:26 maxv Exp $
+# $NetBSD: XEN3_DOMU,v 1.67 2016/12/18 04:35:26 dholland Exp $
include "arch/amd64/conf/std.xen"
-options MULTIPROCESSOR
+options MULTIPROCESSOR
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -77,7 +77,7 @@ options DKWEDGE_AUTODISCOVER # Automati
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
-options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
+options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
# File systems
file-system FFS # UFS
