From nobody Thu Oct 06 22:05:43 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mk59M4k2Jz4VBcP; Thu, 6 Oct 2022 22:05:43 +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 4Mk59M3Bm7z3tcZ; Thu, 6 Oct 2022 22:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665093943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HSKSapT2c3k3aaA6qmWEMyauX7qyp4CF2dan8ACULzQ=; b=aeEN+KlIGZqzvh2BnOfFMhb5hZ5Gh7zwWogjSMvIYKBkldVXg8IYdhZF3oAEh/7GXn5r/a RqonOmBy1BerkDAPqL8Zjq3nsY997mkCvjR/B3EAw8kob2jpwcJ4wDnSkRXdRH2ZcQT5Py x/SjtrmgoA4Hb+anTg1h17eri3r2may4Xl49ZoCDUySb2gcdy3MzxW+YpjR2W3tUZMEdn1 E37MYnD4ndcfCaRim91agihJ5Zldt+Wk81l4fyELO5g1lY5WDznzVAJgbLJVnlG61Wi/Go MWQT0XHuGObKu7AavCsuWY9GxIGLmXrgZJKNWorSiG1kvzUkbzOc7M0PenVElA== 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 4Mk59M2H3GzNs0; Thu, 6 Oct 2022 22:05:43 +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 296M5h3F056218; Thu, 6 Oct 2022 22:05:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 296M5htD056217; Thu, 6 Oct 2022 22:05:43 GMT (envelope-from git) Date: Thu, 6 Oct 2022 22:05:43 GMT Message-Id: <202210062205.296M5htD056217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: b05b1ecbef00 - main - amd64, arm64 pmap: fix a comment typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b05b1ecbef0093107eef8fed52c58aa9c66cc4e0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665093943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HSKSapT2c3k3aaA6qmWEMyauX7qyp4CF2dan8ACULzQ=; b=f9v18zJhwXu7V9GfVVTE6nY+TtiqPeMdnzY1g6aA1eIULV9OAr6qO2gFaY2dM/gvJNRKTN Bbj6czxRmZXTsSvWS7nkzu57V4slUrSI06xvd8WuyKyrhFoS+IZ3BCngyPYoplZ5elEBk6 RF5fXP1ApjiSFU4Kg2WUXT+oufAt9KdDkZYl77b8pV2xKv4o05WV3ucizz5/0VmUjFhB1v 397y500CfyAMM1wCh7O6xsJU/jxpvj3OU3QRb6GJr+WqDaZhTM8tnSw69Ct8QykZihiXM7 ZPvwAc3iofRuhxBHKjMkAS+6zEexPnMsK+lIb2qkQX23FgghNeZm9/U5/5Wkdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665093943; a=rsa-sha256; cv=none; b=odznbVcyJO88dFLjfMrT8ygZqzC1BvjaG3+La5JBQgnH6vfPtI1uITbi0PZDIKS8yEIbts kQE/tZ4NlORCWP3SX9I+fE57H/gqjuBAiZrK05azEWhT57XDQRuegYciEESfxa62eN1f2n GHmK5SM/MmMQB96SNR35a0Yxnd88EMKr1NPgwq8yjA2HCcEwqXErF9VTuJvbA3zQ9lTdSk 0UlOhjw5J3gtknemyE40LufPVKmSwY/e6IC0L5XWGw133U/oB1WrrSZOi8lEsmDBGEIOrv UVFMUkkGZ15+0ovlPr8alX94JCoCIGe9jIr9Pkm05yInUFWvSQEY53N4IyKeag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b05b1ecbef0093107eef8fed52c58aa9c66cc4e0 commit b05b1ecbef0093107eef8fed52c58aa9c66cc4e0 Author: Mitchell Horne AuthorDate: 2022-10-04 19:22:20 +0000 Commit: Mitchell Horne CommitDate: 2022-10-06 22:04:54 +0000 amd64, arm64 pmap: fix a comment typo There is no such error code. Fixes: 1d5ebad06c20b ("pmap: optimize MADV_WILLNEED on existing superpages") --- sys/amd64/amd64/pmap.c | 2 +- sys/arm64/arm64/pmap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index b9b031d55d7d..2eedf78413bd 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -7318,7 +7318,7 @@ pmap_every_pte_zero(vm_paddr_t pa) /* * Tries to create the specified 2MB page mapping. Returns KERN_SUCCESS if * the mapping was created, and one of KERN_FAILURE, KERN_NO_SPACE, - * KERN_PROTECTION_FAILURE, or KERN_RESOURCE_FAILURE otherwise. Returns + * KERN_PROTECTION_FAILURE, or KERN_RESOURCE_SHORTAGE otherwise. Returns * KERN_FAILURE if either (1) PMAP_ENTER_NOREPLACE was specified and a 4KB * page mapping already exists within the 2MB virtual address range starting * at the specified virtual address or (2) the requested 2MB page mapping is diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 1e9ada8c89f7..6152cfbfc83f 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -4471,7 +4471,7 @@ pmap_every_pte_zero(vm_paddr_t pa) /* * Tries to create the specified 2MB page mapping. Returns KERN_SUCCESS if * the mapping was created, and one of KERN_FAILURE, KERN_NO_SPACE, or - * KERN_RESOURCE_FAILURE otherwise. Returns KERN_FAILURE if + * KERN_RESOURCE_SHORTAGE otherwise. Returns KERN_FAILURE if * PMAP_ENTER_NOREPLACE was specified and a 4KB page mapping already exists * within the 2MB virtual address range starting at the specified virtual * address. Returns KERN_NO_SPACE if PMAP_ENTER_NOREPLACE was specified and a