git: 535182ea0f95 - stable/12 - Fix a common typo in source code comments

[Gordon Bergling]

The branch stable/12 has been updated by gbe (doc committer):

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

commit 535182ea0f95b944f7e5d2337373b2a22ae3b2b1
Author:     Gordon Bergling <gbe at FreeBSD.org>
AuthorDate: 2021-08-14 12:17:48 +0000
Commit:     Gordon Bergling <gbe at FreeBSD.org>
CommitDate: 2021-08-19 07:36:32 +0000

    Fix a common typo in source code comments
    
    - s/aligment/alignment/
    
    (cherry picked from commit a1581cd73594bbbde638859c31226c2c21be1ab3)
---
 lib/libc/gen/tls.c            | 4 ++--
 share/man/man9/rman.9         | 4 ++--
 sys/arm/allwinner/if_emac.c   | 2 +-
 sys/dev/sound/pci/hda/hdaa.c  | 2 +-
 sys/dev/usb/controller/uhci.c | 2 +-
 sys/dev/usb/usb_busdma.c      | 2 +-
 sys/i386/i386/locore.s        | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/libc/gen/tls.c b/lib/libc/gen/tls.c
index d1cab7a504e1..bb6f24774a7c 100644
--- a/lib/libc/gen/tls.c
+++ b/lib/libc/gen/tls.c
@@ -243,9 +243,9 @@ __libc_free_tls(void *tcb, size_t tcbsize, size_t tcbalign __unused)
  *
  * where:
  *  extra_size is tcbsize - TLS_TCB_SIZE
- *  post_size is used to adjust TCB to TLS aligment for first version of TLS
+ *  post_size is used to adjust TCB to TLS alignment for first version of TLS
  *            layout and is always 0 for second version.
- *  pre_size  is used to adjust TCB aligment for first version and to adjust
+ *  pre_size  is used to adjust TCB alignment for first version and to adjust
  *            TLS alignment for second version.
  *
  */
diff --git a/share/man/man9/rman.9 b/share/man/man9/rman.9
index 3e03c05f9088..9d954fdba22f 100644
--- a/share/man/man9/rman.9
+++ b/share/man/man9/rman.9
@@ -275,7 +275,7 @@ The caller can specify the
 and
 .Fa end
 of an acceptable range,
-as well as a boundary restriction and required aligment,
+as well as a boundary restriction and required alignment,
 and the code will attempt to find a free segment which fits.
 The
 .Fa start
@@ -288,7 +288,7 @@ Therefore,
 must be \[<=]
 .Fa end
 for any allocation to happen.
-The aligment requirement
+The alignment requirement
 .Pq if any
 is specified in
 .Fa flags .
diff --git a/sys/arm/allwinner/if_emac.c b/sys/arm/allwinner/if_emac.c
index 0b19783fb58b..bd6d0c752ded 100644
--- a/sys/arm/allwinner/if_emac.c
+++ b/sys/arm/allwinner/if_emac.c
@@ -408,7 +408,7 @@ emac_rxeof(struct emac_softc *sc, int count)
 		m->m_len = m->m_pkthdr.len = len - ETHER_CRC_LEN;
 
 		/*
-		 * Emac controller needs strict aligment, so to avoid
+		 * Emac controller needs strict alignment, so to avoid
 		 * copying over an entire frame to align, we allocate
 		 * a new mbuf and copy ethernet header + IP header to
 		 * the new mbuf. The new mbuf is prepended into the
diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c
index 5a926a125de5..91e9a65457d4 100644
--- a/sys/dev/sound/pci/hda/hdaa.c
+++ b/sys/dev/sound/pci/hda/hdaa.c
@@ -2193,7 +2193,7 @@ hdaa_channel_getptr(kobj_t obj, void *data)
 	hdaa_unlock(devinfo);
 
 	/*
-	 * Round to available space and force 128 bytes aligment.
+	 * Round to available space and force 128 bytes alignment.
 	 */
 	ptr %= ch->blksz * ch->blkcnt;
 	ptr &= HDA_BLK_ALIGN;
diff --git a/sys/dev/usb/controller/uhci.c b/sys/dev/usb/controller/uhci.c
index 16ffa7756878..709d413e3599 100644
--- a/sys/dev/usb/controller/uhci.c
+++ b/sys/dev/usb/controller/uhci.c
@@ -2934,7 +2934,7 @@ uhci_xfer_setup(struct usb_setup_params *parm)
 	 * We don't allow alignments of
 	 * less than 8 bytes:
 	 *
-	 * NOTE: Allocating using an aligment
+	 * NOTE: Allocating using an alignment 
 	 * of 1 byte has special meaning!
 	 */
 	if (n < 3) {
diff --git a/sys/dev/usb/usb_busdma.c b/sys/dev/usb/usb_busdma.c
index f43926d04aac..b7f0464c1767 100644
--- a/sys/dev/usb/usb_busdma.c
+++ b/sys/dev/usb/usb_busdma.c
@@ -557,7 +557,7 @@ usb_pc_alloc_mem(struct usb_page_cache *pc, struct usb_page *pg,
 		/*
 		 * XXX BUS-DMA workaround - FIXME later:
 		 *
-		 * We assume that that the aligment at this point of
+		 * We assume that that the alignment at this point of
 		 * the code is greater than or equal to the size and
 		 * less than two times the size, so that if we double
 		 * the size, the size will be greater than the
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 454f7f0a1010..035be23a0a7a 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -349,7 +349,7 @@ ENTRY(identify_cpu)
 	testl	%eax,%eax
 	jnz	try486
 
-	/* NexGen CPU does not have aligment check flag. */
+	/* NexGen CPU does not have alignment check flag. */
 	pushfl
 	movl	$0x5555, %eax
 	xorl	%edx, %edx