Module Name: src
Committed By: ryo
Date: Thu Jan 12 05:24:36 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0 XEN3_DOMU majors.amd64
std.amd64 std.xen
src/sys/arch/i386/conf: ALL GENERIC INSTALL_FLOPPY XEN3_DOM0 XEN3_DOMU
majors.i386 std.i386
Log Message:
white space police
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.449 -r1.450 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/amd64/conf/majors.amd64
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amd64/conf/std.amd64
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amd64/conf/std.xen
cvs rdiff -u -r1.410 -r1.411 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1145 -r1.1146 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/i386/conf/INSTALL_FLOPPY \
src/sys/arch/i386/conf/std.i386
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/i386/conf/XEN3_DOMU
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/i386/conf/majors.i386
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.48 src/sys/arch/amd64/conf/ALL:1.49
--- src/sys/arch/amd64/conf/ALL:1.48 Tue Dec 27 01:11:52 2016
+++ src/sys/arch/amd64/conf/ALL Thu Jan 12 05:24:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.48 2016/12/27 01:11:52 pgoyette Exp $
+# $NetBSD: ALL,v 1.49 2017/01/12 05:24:36 ryo 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.48 $"
+#ident "ALL-$Revision: 1.49 $"
maxusers 64 # estimated number of users
@@ -163,35 +163,35 @@ 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
-file-system EXT2FS # second extended file system (linux)
-file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system NTFS # Windows/NT file system (experimental)
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-file-system NULLFS # loopback file system
-file-system OVERLAY # overlay file system
+file-system FFS # UFS
+file-system EXT2FS # second extended file system (linux)
+file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system NTFS # Windows/NT file system (experimental)
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+file-system NULLFS # loopback file system
+file-system OVERLAY # overlay file system
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system PROCFS # /proc
-file-system UMAPFS # NULLFS + uid and gid remapping
-file-system UNION # union file system
-file-system CODA # Coda File System; also needs vcoda (below)
-file-system SMBFS # experimental - CIFS; also needs nsmb (below)
-file-system SYSVBFS # System V boot file system
-file-system PTYFS # /dev/ptm support
-file-system TMPFS # Efficient memory file-system
-file-system UDF # experimental - OSTA UDF CD/DVD file-system
-file-system HFS # experimental - Apple HFS+ file system
-file-system EFS # Silicon Graphics Extent File System
-file-system FILECORE # Acorn filecore file system
-file-system ADOSFS # AmigaDOS file system
+file-system PROCFS # /proc
+file-system UMAPFS # NULLFS + uid and gid remapping
+file-system UNION # union file system
+file-system CODA # Coda File System; also needs vcoda (below)
+file-system SMBFS # experimental - CIFS; also needs nsmb (below)
+file-system SYSVBFS # System V boot file system
+file-system PTYFS # /dev/ptm support
+file-system TMPFS # Efficient memory file-system
+file-system UDF # experimental - OSTA UDF CD/DVD file-system
+file-system HFS # experimental - Apple HFS+ file system
+file-system EFS # Silicon Graphics Extent File System
+file-system FILECORE # Acorn filecore file system
+file-system ADOSFS # AmigaDOS file system
file-system NILFS # experimental - NTT's NiLFS(2)
file-system V7FS # 7th Edition(V7) File System
file-system CHFS # Chip File System
@@ -529,14 +529,14 @@ wsdisplay* at wsemuldisplaydev?
#viadrm* at drm? # VIA UniChrome DRM driver
# DRMKMS drivers
-i915drmkms* at pci? dev ? function ?
-intelfb* at intelfbbus?
+i915drmkms* at pci? dev ? function ?
+intelfb* at intelfbbus?
radeon* at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?
-nouveau* at pci? dev ? function ?
-nouveaufb* at nouveaufbbus?
+nouveau* at pci? dev ? function ?
+nouveaufb* at nouveaufbbus?
attimer0 at isa?
pcppi0 at isa?
@@ -827,7 +827,7 @@ satalink* at pci? dev ? function ? # SiI
schide* at pci? dev ? function ? # Intel SCH IDE controllers
siisata* at pci? dev ? function ? # SiI SteelVine controllers
siside* at pci? dev ? function ? # SiS IDE controllers
-slide* at pci? dev ? function ? # Symphony Labs IDE controllers
+slide* at pci? dev ? function ? # Symphony Labs IDE controllers
svwsata* at pci? dev ? function ? # ServerWorks SATA controllers
stpcide* at pci? dev ? function ? # STMicro STPC IDE controllers
toshide* at pci? dev ? function ? # TOSHIBA PICCOLO controllers
@@ -938,7 +938,7 @@ jme* at pci? dev ? function ? # JMicron
le* at pci? dev ? function ? # PCnet-PCI Ethernet
lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet
lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
-malo* at pci? dev ? function ? # Marvell Libertas Wireless
+malo* at pci? dev ? function ? # Marvell Libertas Wireless
mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet
mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet
@@ -1481,11 +1481,11 @@ ubsec* at pci? dev ? function ? # Broadc
# Trusted Platform Module
-tpm* at isa? iomem 0xfed40000 irq 7
-#tpm* at isa? port 0x02e
-#tpm* at isa? port 0x04e
-#tpm* at isa? port 0x07e
-#tpm* at isa? port 0x0ee
+tpm* at isa? iomem 0xfed40000 irq 7
+#tpm* at isa? port 0x02e
+#tpm* at isa? port 0x04e
+#tpm* at isa? port 0x07e
+#tpm* at isa? port 0x0ee
# Joysticks
@@ -1523,7 +1523,7 @@ nand* at nandbus?
# Pseudo-Devices
-pseudo-device crypto # /dev/crypto device
+pseudo-device crypto # /dev/crypto device
pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
@@ -1549,7 +1549,7 @@ options MEMORY_DISK_DYNAMIC # loaded vi
pseudo-device vnd # disk-like interface to files
options VND_COMPRESSION # compressed vnd(4)
-pseudo-device dm # device-mapper disk driver
+pseudo-device dm # device-mapper disk driver
# network pseudo-devices
pseudo-device bpfilter # Berkeley packet filter
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.449 src/sys/arch/amd64/conf/GENERIC:1.450
--- src/sys/arch/amd64/conf/GENERIC:1.449 Sat Dec 31 15:41:39 2016
+++ src/sys/arch/amd64/conf/GENERIC Thu Jan 12 05:24:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.449 2016/12/31 15:41:39 christos Exp $
+# $NetBSD: GENERIC,v 1.450 2017/01/12 05:24:36 ryo Exp $
#
# GENERIC machine description file
#
@@ -18,11 +18,11 @@
# of each device driver in this file see the section 4 man page for the
# device.
-include "arch/amd64/conf/std.amd64"
+include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.449 $"
+#ident "GENERIC-$Revision: 1.450 $"
maxusers 64 # estimated number of users
@@ -142,12 +142,12 @@ 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
+file-system FFS # UFS
file-system MFS # memory file system
-file-system NFS # Network File System client
+file-system NFS # Network File System client
file-system TMPFS # Efficient memory file-system
file-system EXT2FS # second extended file system (linux)
file-system LFS # log-structured file system
@@ -201,7 +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 TCP_SIGNATURE # Enable RFC-2385 TCP md5 signatures
#options ALTQ # Manipulate network interfaces' output queues
#options ALTQ_BLUE # Stochastic Fair Blue
@@ -411,14 +411,14 @@ sysbeep0 at pcppi?
#viadrm* at drm? # VIA DRM driver
# DRMKMS drivers
-i915drmkms* at pci? dev ? function ?
-intelfb* at intelfbbus?
+i915drmkms* at pci? dev ? function ?
+intelfb* at intelfbbus?
radeon* at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?
-nouveau* at pci? dev ? function ?
-nouveaufb* at nouveaufbbus?
+nouveau* at pci? dev ? function ?
+nouveaufb* at nouveaufbbus?
# Cryptographic Devices
@@ -427,11 +427,11 @@ hifn* at pci? dev ? function ? # Hifn 77
ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x
# Trusted Platform Module
-tpm* at isa? iomem 0xfed40000 irq 7
-#tpm* at isa? port 0x02e
-#tpm* at isa? port 0x04e
-#tpm* at isa? port 0x07e
-#tpm* at isa? port 0x0ee
+tpm* at isa? iomem 0xfed40000 irq 7
+#tpm* at isa? port 0x02e
+#tpm* at isa? port 0x04e
+#tpm* at isa? port 0x07e
+#tpm* at isa? port 0x0ee
# Serial Devices
@@ -1222,7 +1222,7 @@ cinclude "arch/amd64/conf/GENERIC.local"
# Pseudo-Devices
-pseudo-device crypto # /dev/crypto device
+pseudo-device crypto # /dev/crypto device
pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
@@ -1278,8 +1278,8 @@ pseudo-device agr # IEEE 802.3ad link
#
# accept filters
-pseudo-device accf_data # "dataready" accept filter
-pseudo-device accf_http # "httpready" accept filter
+pseudo-device accf_data # "dataready" accept filter
+pseudo-device accf_http # "httpready" accept filter
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.126 src/sys/arch/amd64/conf/XEN3_DOM0:1.127
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.126 Mon Dec 26 18:04:31 2016
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Thu Jan 12 05:24:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.126 2016/12/26 18:04:31 cherry Exp $
+# $NetBSD: XEN3_DOM0,v 1.127 2017/01/12 05:24:36 ryo Exp $
include "arch/amd64/conf/std.xen"
@@ -85,29 +85,29 @@ 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
-file-system EXT2FS # second extended file system (linux)
-file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system NTFS # Windows/NT file system (experimental)
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-file-system NULLFS # loopback file system
-file-system OVERLAY # overlay file system
+file-system FFS # UFS
+file-system EXT2FS # second extended file system (linux)
+file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system NTFS # Windows/NT file system (experimental)
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+file-system NULLFS # loopback file system
+file-system OVERLAY # overlay file system
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system PROCFS # /proc
-file-system UMAPFS # NULLFS + uid and gid remapping
-file-system UNION # union file system
-file-system CODA # Coda File System; also needs vcoda (below)
-file-system SMBFS # experimental - CIFS; also needs nsmb (below)
-file-system PTYFS # /dev/pts/N support
-file-system TMPFS # Efficient memory file-system
+file-system PROCFS # /proc
+file-system UMAPFS # NULLFS + uid and gid remapping
+file-system UNION # union file system
+file-system CODA # Coda File System; also needs vcoda (below)
+file-system SMBFS # experimental - CIFS; also needs nsmb (below)
+file-system PTYFS # /dev/pts/N support
+file-system TMPFS # Efficient memory file-system
# File system options
options QUOTA # legacy UFS quotas
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.67 src/sys/arch/amd64/conf/XEN3_DOMU:1.68
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.67 Sun Dec 18 04:35:26 2016
+++ src/sys/arch/amd64/conf/XEN3_DOMU Thu Jan 12 05:24:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.67 2016/12/18 04:35:26 dholland Exp $
+# $NetBSD: XEN3_DOMU,v 1.68 2017/01/12 05:24:36 ryo Exp $
include "arch/amd64/conf/std.xen"
@@ -77,29 +77,29 @@ 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
-file-system EXT2FS # second extended file system (linux)
-file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system NTFS # Windows/NT file system (experimental)
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-file-system NULLFS # loopback file system
-file-system OVERLAY # overlay file system
+file-system FFS # UFS
+file-system EXT2FS # second extended file system (linux)
+file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system NTFS # Windows/NT file system (experimental)
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+file-system NULLFS # loopback file system
+file-system OVERLAY # overlay file system
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system PROCFS # /proc
-file-system UMAPFS # NULLFS + uid and gid remapping
-file-system UNION # union file system
-file-system CODA # Coda File System; also needs vcoda (below)
-file-system SMBFS # experimental - CIFS; also needs nsmb (below)
-file-system PTYFS # /dev/pts/N support
-file-system TMPFS # Efficient memory file-system
+file-system PROCFS # /proc
+file-system UMAPFS # NULLFS + uid and gid remapping
+file-system UNION # union file system
+file-system CODA # Coda File System; also needs vcoda (below)
+file-system SMBFS # experimental - CIFS; also needs nsmb (below)
+file-system PTYFS # /dev/pts/N support
+file-system TMPFS # Efficient memory file-system
# File system options
options QUOTA # legacy UFS quotas
@@ -188,7 +188,7 @@ cinclude "arch/amd64/conf/GENERIC.local"
pseudo-device accf_data # "dataready" accept filter
pseudo-device accf_http # "httpready" accept filter
-pseudo-device crypto # /dev/crypto device
+pseudo-device crypto # /dev/crypto device
pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
Index: src/sys/arch/amd64/conf/majors.amd64
diff -u src/sys/arch/amd64/conf/majors.amd64:1.26 src/sys/arch/amd64/conf/majors.amd64:1.27
--- src/sys/arch/amd64/conf/majors.amd64:1.26 Thu Dec 8 11:31:09 2016
+++ src/sys/arch/amd64/conf/majors.amd64 Thu Jan 12 05:24:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: majors.amd64,v 1.26 2016/12/08 11:31:09 nat Exp $
+# $NetBSD: majors.amd64,v 1.27 2017/01/12 05:24:36 ryo Exp $
#
# Device majors for amd64
#
@@ -86,11 +86,11 @@ device-major kttcp char 92 kttcp
device-major dpt char 96 dpt
device-major twe char 97 twe
-device-major nsmb char 98 nsmb
+device-major nsmb char 98 nsmb
#
# Device majors for Xen. These are assigned here so that:
-# - we are sure there are no conflicts with plain i386
+# - we are sure there are no conflicts with plain i386
# - they appear in the i386 MAKEDEV
#
@@ -99,5 +99,5 @@ device-major xbd char 142 block 142 xbd
device-major xencons char 143 xencons
# Majors up to 143 are reserved for machine-dependent drivers.
-# New machine-independent driver majors are assigned in
+# New machine-independent driver majors are assigned in
# sys/conf/majors.
Index: src/sys/arch/amd64/conf/std.amd64
diff -u src/sys/arch/amd64/conf/std.amd64:1.10 src/sys/arch/amd64/conf/std.amd64:1.11
--- src/sys/arch/amd64/conf/std.amd64:1.10 Thu May 7 19:14:55 2015
+++ src/sys/arch/amd64/conf/std.amd64 Thu Jan 12 05:24:36 2017
@@ -1,15 +1,15 @@
-# $NetBSD: std.amd64,v 1.10 2015/05/07 19:14:55 mrg Exp $
+# $NetBSD: std.amd64,v 1.11 2017/01/12 05:24:36 ryo Exp $
#
# standard, required NetBSD/amd64 'options'
machine amd64 x86
-include "conf/std" # MI standard options
+include "conf/std" # MI standard options
options CPU_IN_CKSUM
options EXEC_ELF64 # exec ELF binaries
options EXEC_SCRIPT # exec #! scripts
options MTRR
-options MULTIPROCESSOR
+options MULTIPROCESSOR
options CHILD_MAX=1024 # 160 is too few
options OPEN_MAX=1024 # 128 is too few
Index: src/sys/arch/amd64/conf/std.xen
diff -u src/sys/arch/amd64/conf/std.xen:1.8 src/sys/arch/amd64/conf/std.xen:1.9
--- src/sys/arch/amd64/conf/std.xen:1.8 Fri Sep 23 13:31:33 2016
+++ src/sys/arch/amd64/conf/std.xen Thu Jan 12 05:24:36 2017
@@ -1,13 +1,13 @@
-# $NetBSD: std.xen,v 1.8 2016/09/23 13:31:33 joerg Exp $
+# $NetBSD: std.xen,v 1.9 2017/01/12 05:24:36 ryo Exp $
# NetBSD: std.i386,v 1.24 2003/02/26 21:33:36 fvdl Exp
#
# standard, required NetBSD/i386 'options'
machine xen amd64
-include "conf/std" # MI standard options
+include "conf/std" # MI standard options
options XEN #Xen support
-#options __XEN_INTERFACE_VERSION__=0x00030205 # Xen 3.1 interface
+#options __XEN_INTERFACE_VERSION__=0x00030205 # Xen 3.1 interface
options CPU_IN_CKSUM
options EXEC_ELF64 # exec ELF binaries
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.410 src/sys/arch/i386/conf/ALL:1.411
--- src/sys/arch/i386/conf/ALL:1.410 Tue Dec 27 01:11:52 2016
+++ src/sys/arch/i386/conf/ALL Thu Jan 12 05:24:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.410 2016/12/27 01:11:52 pgoyette Exp $
+# $NetBSD: ALL,v 1.411 2017/01/12 05:24:36 ryo Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.410 $"
+#ident "ALL-$Revision: 1.411 $"
maxusers 64 # estimated number of users
@@ -162,35 +162,35 @@ 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
-file-system EXT2FS # second extended file system (linux)
-file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system NTFS # Windows/NT file system (experimental)
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-file-system NULLFS # loopback file system
-file-system OVERLAY # overlay file system
+file-system FFS # UFS
+file-system EXT2FS # second extended file system (linux)
+file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system NTFS # Windows/NT file system (experimental)
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+file-system NULLFS # loopback file system
+file-system OVERLAY # overlay file system
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system PROCFS # /proc
-file-system UMAPFS # NULLFS + uid and gid remapping
-file-system UNION # union file system
-file-system CODA # Coda File System; also needs vcoda (below)
-file-system SMBFS # experimental - CIFS; also needs nsmb (below)
-file-system SYSVBFS # System V boot file system
-file-system PTYFS # /dev/ptm support
-file-system TMPFS # Efficient memory file-system
-file-system UDF # experimental - OSTA UDF CD/DVD file-system
-file-system HFS # experimental - Apple HFS+ file system
-file-system EFS # Silicon Graphics Extent File System
-file-system FILECORE # Acorn filecore file system
-file-system ADOSFS # AmigaDOS file system
+file-system PROCFS # /proc
+file-system UMAPFS # NULLFS + uid and gid remapping
+file-system UNION # union file system
+file-system CODA # Coda File System; also needs vcoda (below)
+file-system SMBFS # experimental - CIFS; also needs nsmb (below)
+file-system SYSVBFS # System V boot file system
+file-system PTYFS # /dev/ptm support
+file-system TMPFS # Efficient memory file-system
+file-system UDF # experimental - OSTA UDF CD/DVD file-system
+file-system HFS # experimental - Apple HFS+ file system
+file-system EFS # Silicon Graphics Extent File System
+file-system FILECORE # Acorn filecore file system
+file-system ADOSFS # AmigaDOS file system
file-system NILFS # experimental - NTT's NiLFS(2)
file-system V7FS # 7th Edition(V7) File System
file-system CHFS # Chip File System
@@ -209,7 +209,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
@@ -234,7 +234,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
@@ -386,7 +386,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)
@@ -609,8 +609,8 @@ wsdisplay* at wsemuldisplaydev?
#viadrm* at drm? # VIA UniChrome DRM driver
# DRMKMS drivers
-i915drmkms* at pci? dev ? function ?
-intelfb* at intelfbbus?
+i915drmkms* at pci? dev ? function ?
+intelfb* at intelfbbus?
radeon* at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?
@@ -619,7 +619,7 @@ nouveau* at pci? dev ? function ?
nouveaufb* at nouveaufbbus?
# DRMUMS drivers
-viadrmums* at drm?
+viadrmums* at drm?
attimer0 at isa?
pcppi0 at isa?
@@ -951,7 +951,7 @@ satalink* at pci? dev ? function ? # SiI
schide* at pci? dev ? function ? # Intel SCH IDE controllers
siisata* at pci? dev ? function ? # SiI SteelVine controllers
siside* at pci? dev ? function ? # SiS IDE controllers
-slide* at pci? dev ? function ? # Symphony Labs IDE controllers
+slide* at pci? dev ? function ? # Symphony Labs IDE controllers
svwsata* at pci? dev ? function ? # ServerWorks SATA controllers
stpcide* at pci? dev ? function ? # STMicro STPC IDE controllers
toshide* at pci? dev ? function ? # TOSHIBA PICCOLO controllers
@@ -1065,7 +1065,7 @@ jme* at pci? dev ? function ? # JMicron
le* at pci? dev ? function ? # PCnet-PCI Ethernet
lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet
lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
-malo* at pci? dev ? function ? # Marvell Libertas Wireless
+malo* at pci? dev ? function ? # Marvell Libertas Wireless
mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet
mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet
@@ -1658,11 +1658,11 @@ ubsec* at pci? dev ? function ? # Broadc
# Trusted Platform Module
-tpm* at isa? iomem 0xfed40000 irq 7
-#tpm* at isa? port 0x02e
-#tpm* at isa? port 0x04e
-#tpm* at isa? port 0x07e
-#tpm* at isa? port 0x0ee
+tpm* at isa? iomem 0xfed40000 irq 7
+#tpm* at isa? port 0x02e
+#tpm* at isa? port 0x04e
+#tpm* at isa? port 0x07e
+#tpm* at isa? port 0x0ee
# Joysticks
@@ -1710,7 +1710,7 @@ nand* at nandbus?
# Pseudo-Devices
-pseudo-device crypto # /dev/crypto device
+pseudo-device crypto # /dev/crypto device
pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
@@ -1737,7 +1737,7 @@ options MEMORY_DISK_DYNAMIC # loaded vi
pseudo-device vnd # disk-like interface to files
options VND_COMPRESSION # compressed vnd(4)
-pseudo-device dm # device-mapper disk driver
+pseudo-device dm # device-mapper disk driver
# network pseudo-devices
pseudo-device bpfilter # Berkeley packet filter
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1145 src/sys/arch/i386/conf/GENERIC:1.1146
--- src/sys/arch/i386/conf/GENERIC:1.1145 Tue Dec 13 20:42:18 2016
+++ src/sys/arch/i386/conf/GENERIC Thu Jan 12 05:24:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1145 2016/12/13 20:42:18 christos Exp $
+# $NetBSD: GENERIC,v 1.1146 2017/01/12 05:24:36 ryo Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1145 $"
+#ident "GENERIC-$Revision: 1.1146 $"
maxusers 64 # estimated number of users
@@ -157,7 +157,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-system FFS # UFS
file-system NFS # Network File System client
@@ -360,7 +360,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)
@@ -573,8 +573,8 @@ sysbeep0 at pcppi?
#viadrm* at drm? # VIA DRM driver
# DRMKMS drivers
-i915drmkms* at pci? dev ? function ?
-intelfb* at intelfbbus?
+i915drmkms* at pci? dev ? function ?
+intelfb* at intelfbbus?
radeon* at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?
@@ -583,7 +583,7 @@ nouveau* at pci? dev ? function ?
nouveaufb* at nouveaufbbus?
# DRMUMS drivers
-#viadrmums* at drm?
+#viadrmums* at drm?
# Serial Devices
@@ -836,8 +836,8 @@ ss* at scsibus? target ? lun ? # SCSI sc
uk* at scsibus? target ? lun ? # SCSI unknown
# NVM Express controllers and devices
-nvme* at pci? dev ? function ?
-ld* at nvme? nsid ?
+nvme* at pci? dev ? function ?
+ld* at nvme? nsid ?
# RAID controllers and devices
aac* at pci? dev ? function ? # Adaptec AAC family
@@ -1573,11 +1573,11 @@ hifn* at pci? dev ? function ? # Hifn 77
ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x
# Trusted Platform Module
-tpm* at isa? iomem 0xfed40000 irq 7
-#tpm* at isa? port 0x02e
-#tpm* at isa? port 0x04e
-#tpm* at isa? port 0x07e
-#tpm* at isa? port 0x0ee
+tpm* at isa? iomem 0xfed40000 irq 7
+#tpm* at isa? port 0x02e
+#tpm* at isa? port 0x04e
+#tpm* at isa? port 0x07e
+#tpm* at isa? port 0x0ee
# Joysticks
@@ -1620,7 +1620,7 @@ cinclude "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
-pseudo-device crypto # /dev/crypto device
+pseudo-device crypto # /dev/crypto device
pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
@@ -1673,7 +1673,7 @@ pseudo-device agr # IEEE 802.3ad link
#pseudo-device pflog # PF log if
#pseudo-device pfsync # PF sync if
#pseudo-device npf # NPF packet filter
-#pseudo-device etherip # Tunnel Ethernet over IP
+#pseudo-device etherip # Tunnel Ethernet over IP
# srt is EXPERIMENTAL
#pseudo-device srt # source-address-based routing
Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.34 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.35
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.34 Tue Dec 13 20:42:18 2016
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Thu Jan 12 05:24:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.34 2016/12/13 20:42:18 christos Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.35 2017/01/12 05:24:36 ryo Exp $
#
# INSTALL - Installation kernel.
#
@@ -105,22 +105,22 @@ options COMPAT_70 # NetBSD 7.0 binary c
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# File systems
-file-system FFS # UFS
-file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system NTFS # Windows/NT Filesystem
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-#file-system FDESC # /dev/fd
-#file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
-#file-system PTYFS # /dev/pts/N support
-file-system TMPFS # Efficient memory file-system
+file-system FFS # UFS
+file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system NTFS # Windows/NT Filesystem
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+#file-system FDESC # /dev/fd
+#file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
+#file-system PTYFS # /dev/pts/N support
+file-system TMPFS # Efficient memory file-system
# Filesystem options
#options QUOTA # legacy UFS quotas
Index: src/sys/arch/i386/conf/std.i386
diff -u src/sys/arch/i386/conf/std.i386:1.34 src/sys/arch/i386/conf/std.i386:1.35
--- src/sys/arch/i386/conf/std.i386:1.34 Thu May 7 19:14:55 2015
+++ src/sys/arch/i386/conf/std.i386 Thu Jan 12 05:24:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: std.i386,v 1.34 2015/05/07 19:14:55 mrg Exp $
+# $NetBSD: std.i386,v 1.35 2017/01/12 05:24:36 ryo Exp $
#
# standard, required NetBSD/i386 'options'
@@ -13,7 +13,7 @@ options EXEC_SCRIPT # exec #! scripts
#options CRYPTO_MD_DES_CBC # machine-dependent DES CBC code
#options CRYPTO_MD_BF_ENC # machine-dependent code for BF_encrypt
#options CRYPTO_MD_BF_CBC # careful: uses bswapl, requires 486
-options MULTIPROCESSOR # multiprocessor support
+options MULTIPROCESSOR # multiprocessor support
options MPBIOS # configure CPUs and APICs using MPBIOS
options CHILD_MAX=1024 # 160 is too few
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.104 src/sys/arch/i386/conf/XEN3_DOM0:1.105
--- src/sys/arch/i386/conf/XEN3_DOM0:1.104 Mon Dec 26 18:04:31 2016
+++ src/sys/arch/i386/conf/XEN3_DOM0 Thu Jan 12 05:24:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.104 2016/12/26 18:04:31 cherry Exp $
+# $NetBSD: XEN3_DOM0,v 1.105 2017/01/12 05:24:36 ryo Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -108,29 +108,29 @@ 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
-file-system EXT2FS # second extended file system (linux)
-file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system NTFS # Windows/NT file system (experimental)
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-file-system NULLFS # loopback file system
-file-system OVERLAY # overlay file system
+file-system FFS # UFS
+file-system EXT2FS # second extended file system (linux)
+file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system NTFS # Windows/NT file system (experimental)
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+file-system NULLFS # loopback file system
+file-system OVERLAY # overlay file system
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system PROCFS # /proc
-file-system UMAPFS # NULLFS + uid and gid remapping
-file-system UNION # union file system
-file-system CODA # Coda File System; also needs vcoda (below)
-file-system SMBFS # experimental - CIFS; also needs nsmb (below)
-file-system PTYFS # /dev/pts/N support
-file-system TMPFS # Efficient memory file-system
+file-system PROCFS # /proc
+file-system UMAPFS # NULLFS + uid and gid remapping
+file-system UNION # union file system
+file-system CODA # Coda File System; also needs vcoda (below)
+file-system SMBFS # experimental - CIFS; also needs nsmb (below)
+file-system PTYFS # /dev/pts/N support
+file-system TMPFS # Efficient memory file-system
# File system options
options QUOTA # legacy UFS quotas
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.70 src/sys/arch/i386/conf/XEN3_DOMU:1.71
--- src/sys/arch/i386/conf/XEN3_DOMU:1.70 Sat Dec 17 14:49:26 2016
+++ src/sys/arch/i386/conf/XEN3_DOMU Thu Jan 12 05:24:36 2017
@@ -1,8 +1,8 @@
-# $NetBSD: XEN3_DOMU,v 1.70 2016/12/17 14:49:26 maxv Exp $
+# $NetBSD: XEN3_DOMU,v 1.71 2017/01/12 05:24:36 ryo Exp $
include "arch/xen/conf/std.xen"
-options MULTIPROCESSOR
+options MULTIPROCESSOR
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -92,29 +92,29 @@ 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
-file-system EXT2FS # second extended file system (linux)
-file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system NTFS # Windows/NT file system (experimental)
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-file-system NULLFS # loopback file system
-file-system OVERLAY # overlay file system
+file-system FFS # UFS
+file-system EXT2FS # second extended file system (linux)
+file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system NTFS # Windows/NT file system (experimental)
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+file-system NULLFS # loopback file system
+file-system OVERLAY # overlay file system
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system PROCFS # /proc
-file-system UMAPFS # NULLFS + uid and gid remapping
-file-system UNION # union file system
-file-system CODA # Coda File System; also needs vcoda (below)
-file-system SMBFS # experimental - CIFS; also needs nsmb (below)
-file-system PTYFS # /dev/pts/N support
-file-system TMPFS # Efficient memory file-system
+file-system PROCFS # /proc
+file-system UMAPFS # NULLFS + uid and gid remapping
+file-system UNION # union file system
+file-system CODA # Coda File System; also needs vcoda (below)
+file-system SMBFS # experimental - CIFS; also needs nsmb (below)
+file-system PTYFS # /dev/pts/N support
+file-system TMPFS # Efficient memory file-system
file-system NILFS # experimental - NTT's NiLFS(2)
#file-system V7FS # 7th Edition(V7) File System
@@ -200,7 +200,7 @@ cinclude "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
-pseudo-device crypto # /dev/crypto device
+pseudo-device crypto # /dev/crypto device
pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
@@ -260,7 +260,7 @@ pseudo-device vcoda # coda minicache <
pseudo-device nsmb # experimental - SMB requester
# userland interface to drivers, including autoconf and properties retrieval
-pseudo-device drvctl
+pseudo-device drvctl
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/i386/conf/majors.i386
diff -u src/sys/arch/i386/conf/majors.i386:1.45 src/sys/arch/i386/conf/majors.i386:1.46
--- src/sys/arch/i386/conf/majors.i386:1.45 Thu Dec 8 11:31:11 2016
+++ src/sys/arch/i386/conf/majors.i386 Thu Jan 12 05:24:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: majors.i386,v 1.45 2016/12/08 11:31:11 nat Exp $
+# $NetBSD: majors.i386,v 1.46 2017/01/12 05:24:36 ryo Exp $
#
# Device majors for i386
#
@@ -93,7 +93,7 @@ device-major cgd char 93 block 21 cgd
# major 94 free (ex veriexec which is now a MI major)
device-major dpt char 96 dpt
device-major twe char 97 twe
-device-major nsmb char 98 nsmb
+device-major nsmb char 98 nsmb
device-major vmmon char 99 vmmon
device-major vmnet char 100 vmnet
device-major ksyms char 101 ksyms
@@ -106,7 +106,7 @@ device-major mt char 107 block 24 mt
#
# Device majors for Xen. These are assigned here so that:
-# - we are sure there are no conflicts with plain i386
+# - we are sure there are no conflicts with plain i386
# - they appear in the i386 MAKEDEV
#
@@ -115,5 +115,5 @@ device-major xbd char 142 block 142 xbd
device-major xencons char 143 xencons
# Majors up to 143 are reserved for machine-dependent drivers.
-# New machine-independent driver majors are assigned in
+# New machine-independent driver majors are assigned in
# sys/conf/majors.
