From owner-svn-src-head@freebsd.org Wed Jul 15 09:48:37 2020 Return-Path: Delivered-To: svn-src-head@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 134CE35FB48; Wed, 15 Jul 2020 09:48:37 +0000 (UTC) (envelope-from kib@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B6CJ46hYTz3RTY; Wed, 15 Jul 2020 09:48:36 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C952B15601; Wed, 15 Jul 2020 09:48:36 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06F9majp083372; Wed, 15 Jul 2020 09:48:36 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06F9maDu083371; Wed, 15 Jul 2020 09:48:36 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202007150948.06F9maDu083371@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 15 Jul 2020 09:48:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r363211 - head/sys/amd64/amd64 X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/amd64/amd64 X-SVN-Commit-Revision: 363211 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jul 2020 09:48:37 -0000 Author: kib Date: Wed Jul 15 09:48:36 2020 New Revision: 363211 URL: https://svnweb.freebsd.org/changeset/base/363211 Log: Grammar and typo fixes. Submitted by: alc MFC after: 20 days Modified: head/sys/amd64/amd64/mp_machdep.c Modified: head/sys/amd64/amd64/mp_machdep.c ============================================================================== --- head/sys/amd64/amd64/mp_machdep.c Wed Jul 15 01:26:28 2020 (r363210) +++ head/sys/amd64/amd64/mp_machdep.c Wed Jul 15 09:48:36 2020 (r363211) @@ -203,7 +203,7 @@ cpu_mp_start(void) cpu_apic_ids[i] = -1; } - /* Install an inter-CPU IPI for for cache and TLB invalidations. */ + /* Install an inter-CPU IPI for cache and TLB invalidations. */ setidt(IPI_INVLOP, pti ? IDTVEC(invlop_pti) : IDTVEC(invlop), SDT_SYSIGT, SEL_KPL, 0); @@ -557,7 +557,7 @@ static enum invl_op_codes invl_op_pg; * at location (cpu, my_cpuid) for each target cpu. After that IPI is * sent to all targets which scan for zeroed scoreboard generation * words. Upon finding such word the shootdown data is read from - * corresponding cpu' pcpu, and generation is set. Meantime initiator + * corresponding cpu's pcpu, and generation is set. Meantime initiator * loops waiting for all zeroed generations in scoreboard to update. */ static uint32_t *invl_scoreboard; @@ -654,8 +654,8 @@ smp_targeted_tlb_shootdown(cpuset_t mask, pmap_t pmap, /* * Initiator must have interrupts enabled, which prevents - * non-invalidation IPIs, that takes smp_ipi_mtx spinlock, - * from deadlocking with as. On the other hand, preemption + * non-invalidation IPIs that take smp_ipi_mtx spinlock, + * from deadlocking with us. On the other hand, preemption * must be disabled to pin initiator to the instance of the * pcpu pc_smp_tlb data and scoreboard line. */ @@ -687,7 +687,7 @@ smp_targeted_tlb_shootdown(cpuset_t mask, pmap_t pmap, /* * IPI acts as a fence between writing to the scoreboard above * (zeroing slot) and reading from it below (wait for - * acknowledge). + * acknowledgment). */ if (CPU_ISFULLSET(&mask)) { ipi_all_but_self(IPI_INVLOP); @@ -1080,7 +1080,7 @@ invlop_handler(void) /* * This acquire fence and its corresponding release - * fence in smp_targeted_tlb_shootdown(), is between + * fence in smp_targeted_tlb_shootdown() is between * reading zero scoreboard slot and accessing PCPU of * initiator for pc_smp_tlb values. */