From owner-dev-commits-src-main@freebsd.org Sat Aug 14 12:18:39 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2232D66C095; Sat, 14 Aug 2021 12:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Gmzwv0QHbz3jgN; Sat, 14 Aug 2021 12:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EA7E822184; Sat, 14 Aug 2021 12:18:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17ECIc5H078197; Sat, 14 Aug 2021 12:18:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17ECIcEC078196; Sat, 14 Aug 2021 12:18:38 GMT (envelope-from git) Date: Sat, 14 Aug 2021 12:18:38 GMT Message-Id: <202108141218.17ECIcEC078196@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: a1581cd73594 - main - Fix a common typo in source code comments MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1581cd73594bbbde638859c31226c2c21be1ab3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Aug 2021 12:18:39 -0000 The branch main has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=a1581cd73594bbbde638859c31226c2c21be1ab3 commit a1581cd73594bbbde638859c31226c2c21be1ab3 Author: Gordon Bergling AuthorDate: 2021-08-14 12:17:48 +0000 Commit: Gordon Bergling CommitDate: 2021-08-14 12:17:48 +0000 Fix a common typo in source code comments - s/aligment/alignment/ MFC after: 5 days --- 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 69b87aea52bf..98915ef4ddf7 100644 --- a/lib/libc/gen/tls.c +++ b/lib/libc/gen/tls.c @@ -249,9 +249,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 3faea2a014fc..a5a8c34cde90 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 73e7e889916a..5110ce2f9fb4 100644 --- a/sys/arm/allwinner/if_emac.c +++ b/sys/arm/allwinner/if_emac.c @@ -409,7 +409,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 621361c5fa70..82c309996d75 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -2191,7 +2191,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 41caa1610989..4c72118d9900 100644 --- a/sys/dev/usb/controller/uhci.c +++ b/sys/dev/usb/controller/uhci.c @@ -2869,7 +2869,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 26fddaef65b2..4806903fa83a 100644 --- a/sys/dev/usb/usb_busdma.c +++ b/sys/dev/usb/usb_busdma.c @@ -546,7 +546,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 24c583dec554..6dffc4f97fdd 100644 --- a/sys/i386/i386/locore.s +++ b/sys/i386/i386/locore.s @@ -340,7 +340,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