From nobody Thu Jul 25 06:47:39 2024 X-Original-To: dev-commits-src-main@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 4WV1fM2z0bz5RRpF; Thu, 25 Jul 2024 06:47: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WV1fM2RMLz4kqY; Thu, 25 Jul 2024 06:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721890059; 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=K4NYDy957tixlm1/LartaLatPm2nWZt6Cy5sSp22ed0=; b=bJYhCfOFiNy5/TkqvAr2Xxe7M3z9OhC4+WMEzrjrbCYqgMghgClxWXZ4nBovLpP+pm+VJ6 iseZvAm1eY8u1XZgjqPRdQqpkRept6N0Q4Rt4A8uPz/e5Sz2FUBgBTTZfVP3AeJxL3wDW8 aa++nDRinPS0lu29KUnHo9kvdHZ3L/psZ235FAHjVSMDP9bRAbGcjKAlLKS2+MKXb8HjkE ZBzSAQOg2y6pX238MVH00ETvqw7diF6jZ2kCUDTFZ8nOlr5khsxBYUpw1KDDqtO/PM31Jw tLB2vvQvQu9d8n8YK6G8qxm+jhEUIl7LyOzutIVkW4cHbQR3ungAJKXH2HGoQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721890059; a=rsa-sha256; cv=none; b=QUTZ/ztWm5odaUlrpDqeapHppE83IHK+p7scEeers9Cfj4Abj+ZJWCz5PVKUMVUSb/s9pD sRBAbyj04W7Hr3/lqJ5htcNx2gjw3h3CHeLYFpdjPP0UAlAgkAGgRk2sgor0nKGr0DFCjA eUuuJQfN2idCXTWN+Kq/ItBY/h7IktXY/g1p0lqzl374+X+AoLfLl6+UOgni7pFXohQ7Tp DyFlnKYSHmZoroOHgh+/Tf+eBDHsbBeQpFYHJyfQQJlUoMbctmcQvHiJ/4zvyOud6g0Kiq 7+x0keeuAJcwMDkZK7y613ClZMKdDlJL5QKQwDwWDuQx4lT3RsErlq8lihVFwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721890059; 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=K4NYDy957tixlm1/LartaLatPm2nWZt6Cy5sSp22ed0=; b=sbO4idg9qj60OCErjgd4H5NfuNF1EtC4W+xzpCF0v0c/1R7rt8DoO3Xa5m6pvCEUgNUFAe 6HZpmrC3FlulCL6wDvbVOyezP1I8AsJG/66IKjX5fTZQXe1/JUy3UAKx11ZqBWqqcHchVP rvgfjZEjJUxBXqbNlYXFv96w0wLhdVL4FDDLUdPmGWI8DyH1HJ1EeI0r4nNDPvr+wpnlMD 0o2FJ4rSxrBFJKfHh+taUMErC9nWsF3cnMUOfF52ebRs8p77Bqu8q/ugUSHnM+4Sv5aYdu VMMHPOGl2hW0a52QrBaRoZYxBQKCOt6zmMMYaduRyB+xtHoI+Yv6SaAG1Sw/kQ== 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 4WV1fM22bTzl4r; Thu, 25 Jul 2024 06:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46P6ldh3035277; Thu, 25 Jul 2024 06:47:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46P6ldHN035274; Thu, 25 Jul 2024 06:47:39 GMT (envelope-from git) Date: Thu, 25 Jul 2024 06:47:39 GMT Message-Id: <202407250647.46P6ldHN035274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: 98dd639c94f7 - main - arm64 pmap: Eliminate an unnecessary conditional List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98dd639c94f716858ae29958f484729b1d2fd387 Auto-Submitted: auto-generated The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=98dd639c94f716858ae29958f484729b1d2fd387 commit 98dd639c94f716858ae29958f484729b1d2fd387 Author: Alan Cox AuthorDate: 2024-07-24 22:32:32 +0000 Commit: Alan Cox CommitDate: 2024-07-25 06:46:47 +0000 arm64 pmap: Eliminate an unnecessary conditional Eliminate an unnecessary test whether a pointer is non-NULL from pmap_bti_same(). Reviewed by: dougm --- sys/arm64/arm64/pmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 2540b5eaf4b9..59de6ef37f09 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -9396,8 +9396,7 @@ pmap_bti_same(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, pt_entry_t *pte) return (false); rs = next_rs; } - if (rs != NULL) - *pte |= ATTR_S1_GP; + *pte |= ATTR_S1_GP; return (true); }