Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Feb 2023 14:37:12 GMT
From:      Mike Karels <karels@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: dd6f6030cc29 - main - amd64 kernel config: clean up whitespace
Message-ID:  <202302241437.31OEbCvt049457@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by karels:

URL: https://cgit.FreeBSD.org/src/commit/?id=dd6f6030cc2981ce860b664e54bf17cf9fc80668

commit dd6f6030cc2981ce860b664e54bf17cf9fc80668
Author:     Mike Karels <karels@FreeBSD.org>
AuthorDate: 2023-02-23 17:09:39 +0000
Commit:     Mike Karels <karels@FreeBSD.org>
CommitDate: 2023-02-24 14:36:28 +0000

    amd64 kernel config: clean up whitespace
    
    Most options in kernel config files use "options<space><tab>OPTION".
    This allows the option to be commented out without shifting columns.
    A few options had two tabs, and some had spaces.  Make them consistent.
---
 sys/amd64/conf/FIRECRACKER    | 12 ++++++------
 sys/amd64/conf/GENERIC        | 12 ++++++------
 sys/amd64/conf/GENERIC-MMCCAM |  8 ++++----
 sys/amd64/conf/NOTES          |  6 +++---
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/sys/amd64/conf/FIRECRACKER b/sys/amd64/conf/FIRECRACKER
index 0ee5c93fe458..4a9946f25991 100644
--- a/sys/amd64/conf/FIRECRACKER
+++ b/sys/amd64/conf/FIRECRACKER
@@ -29,14 +29,14 @@ options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
-options		ROUTE_MPATH		# Multipath routing support
-options		FIB_ALGO		# Modular fib lookups
+options 	ROUTE_MPATH		# Multipath routing support
+options 	FIB_ALGO		# Modular fib lookups
 options 	TCP_OFFLOAD		# TCP offload
 options 	TCP_BLACKBOX		# Enhanced TCP event logging
 options 	TCP_HHOOK		# hhook(9) framework for TCP
-options		TCP_RFC7413		# TCP Fast Open
+options 	TCP_RFC7413		# TCP Fast Open
 options 	SCTP_SUPPORT		# Allow kldload of SCTP
-options		KERN_TLS		# TLS transmit & receive offload
+options 	KERN_TLS		# TLS transmit & receive offload
 options 	FFS			# Berkeley Fast Filesystem
 options 	SOFTUPDATES		# Enable FFS soft updates support
 options 	UFS_ACL			# Support for access control lists
@@ -175,11 +175,11 @@ envvar	machdep.disable_tsc_calibration="1"
 
 # Provide bug-for-bug compatiblity with Linux in MP Table searching
 # and parsing.  Firecracker relies on these bugs.
-options		MPTABLE_LINUX_BUG_COMPAT
+options 	MPTABLE_LINUX_BUG_COMPAT
 
 # Disable the automatic registration of a PCI bridge; we do in fact
 # not have one.
-options		NO_LEGACY_PCIB
+options 	NO_LEGACY_PCIB
 
 # Bus support.
 # Note that Firecracker provides neither ACPI nor PCI; but removing these
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 56b881d80a52..46c901300371 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -31,15 +31,15 @@ options 	VIMAGE			# Subsystem virtualization, e.g. VNET
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	IPSEC_SUPPORT		# Allow kldload of ipsec and tcpmd5
-options		NETLINK			# netlink(4) support
-options		ROUTE_MPATH		# Multipath routing support
-options		FIB_ALGO		# Modular fib lookups
+options 	NETLINK			# netlink(4) support
+options 	ROUTE_MPATH		# Multipath routing support
+options 	FIB_ALGO		# Modular fib lookups
 options 	TCP_OFFLOAD		# TCP offload
 options 	TCP_BLACKBOX		# Enhanced TCP event logging
 options 	TCP_HHOOK		# hhook(9) framework for TCP
-options		TCP_RFC7413		# TCP Fast Open
+options 	TCP_RFC7413		# TCP Fast Open
 options 	SCTP_SUPPORT		# Allow kldload of SCTP
-options		KERN_TLS		# TLS transmit & receive offload
+options 	KERN_TLS		# TLS transmit & receive offload
 options 	FFS			# Berkeley Fast Filesystem
 options 	SOFTUPDATES		# Enable FFS soft updates support
 options 	UFS_ACL			# Support for access control lists
@@ -136,7 +136,7 @@ device		smbios
 options 	IOMMU
 device		pci
 options 	PCI_HP			# PCI-Express native HotPlug
-options		PCI_IOV			# PCI SR-IOV support
+options 	PCI_IOV			# PCI SR-IOV support
 
 options 	COMPAT_LINUXKPI
 
diff --git a/sys/amd64/conf/GENERIC-MMCCAM b/sys/amd64/conf/GENERIC-MMCCAM
index 0aa7a7da1072..afb0d128dca4 100644
--- a/sys/amd64/conf/GENERIC-MMCCAM
+++ b/sys/amd64/conf/GENERIC-MMCCAM
@@ -9,7 +9,7 @@ include         MINIMAL
 ident		GENERIC-MMCCAM
 
 # Access GPT-formatted and labeled root volume
-options         GEOM_LABEL
+options 	GEOM_LABEL
 
 # UART -- for bhyve console
 device          uart
@@ -27,8 +27,8 @@ device		pass
 device		scbus
 device		da
 
-options	       MMCCAM
+options 	MMCCAM
 
 # Add CAMDEBUG stuff
-options	       CAMDEBUG
-options	       CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
+options 	CAMDEBUG
+options 	CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 4b107b19ac42..e568842f2830 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -630,7 +630,7 @@ options 	COMPAT_AOUT
 # ZFS support
 
 # NB: This depends on crypto, cryptodev and ZSTDIO
-options		ZFS
+options 	ZFS
 
 #####################################################################
 # VM OPTIONS
@@ -664,5 +664,5 @@ options 	VM_KMEM_SIZE_SCALE
 
 # GCOV (code coverage) support
 
-options		LINDEBUGFS
-options		GCOV
+options 	LINDEBUGFS
+options 	GCOV



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302241437.31OEbCvt049457>