From nobody Fri Jul 4 04:57:39 2025 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 4bYLwh088Lz60jJf; Fri, 04 Jul 2025 04:57:40 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bYLwg6mgxz3rWS; Fri, 04 Jul 2025 04:57:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751605059; 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=XqxKAf5PWn5ZWfD18xKJ7vL5gRjB4eRuDEC4bCXqQ4Q=; b=FxV34GdAXRDZANf1f9IhZyG5iZi+te2F2yYngF1LGJX114+uBjAaXHNjPQsxEA04ytCsht n8xJk5BpI7BsU+GEZdSvpDHK+HY843GigQWFY+o/bf/ZWzcOnR9RXa+jZ6QchvxFRZ/HYX O1IVLUzjFTPBhlhU460P/plgfgefkEiFtdaLjiFxpcx+NyIfpElTQVny/ZuBdZpKvDRjEe QHyTPOpKyrNziXNeYgIEfCdwKbqVT+P4ZO1U1ex39xHWDPZ8BQ4Jy3xvy7qBQg4XNez9Eo EKUZrGkpMLFiorWB/vTPEUhHFDVr/Hg2mtSHjGS3Ke6Nfl4fgYmdG0QFjficgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751605059; 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=XqxKAf5PWn5ZWfD18xKJ7vL5gRjB4eRuDEC4bCXqQ4Q=; b=nrbBpyswNhuvTPzeE7NKtIcaxH7D5Ic4kuqPkOgZdLiOaGZf4EPfpEnSNmyn2zIuLkG82K 1Ioebkw4GWP1ApQoNQb/IM7PlugxWdwfS/WmJZLPnSeeVxUg6gGKSGtx85S0FIimZ7cg3G lfDmA/EiKTlPp42O4jToghsCi4W/P4l3yO+VrEA06rq0hVAw4+IRW2MjtndaaCOxiI4zuY drcJq2jZiVHXu/F6g+KfFKTsYsRF17qaWYJPQNjaMxM2fHMrf7ojRchcIBKKwqrYJpFnMO TjVimmfQ0rzvCrtvFsAGRJW5XtV5jWMUUrWM1SkAggsUtHAye+k9E5zCcWs/Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751605059; a=rsa-sha256; cv=none; b=LkwU6bch7XpCBgNhyeVYxPOW0gq7y5ZkDdornuj1qET6OlMWLeWjT8tHgIbA9g2oabk3vd JYlIZydweIsWH9OHUyYXE0g8hbHhu8vjm63MI4JaM/l2vsts0qmOMcWSZvRY1WZVhu27zC 1GMG9iu4lDCIydKmU6rpA5Y5L7OmBgsD0u8rcjz09aPhAmNFFVw9QRhx7cgQOzZA625LLc lzhITsaklDoPTSxG9abnItakATbjo3VwJDjGDY/boxmFlsutA6qNR8Gy2HdN2HsE3559Ju F1TjVbtCpTAm13LTtX0q9y7jp7l2lHSfToddvFFquIvhjqNOd5VmUlaTfJgAUw== 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 4bYLwg69bJzc3m; Fri, 04 Jul 2025 04:57: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 5644vd4X050100; Fri, 4 Jul 2025 04:57:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5644vdb0050097; Fri, 4 Jul 2025 04:57:39 GMT (envelope-from git) Date: Fri, 4 Jul 2025 04:57:39 GMT Message-Id: <202507040457.5644vdb0050097@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b6fb125330dd - stable/14 - amd64: express KV4ADDR() using KV5ADDR() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b6fb125330dd4c079ebb734e97e7378e30fc2c89 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b6fb125330dd4c079ebb734e97e7378e30fc2c89 commit b6fb125330dd4c079ebb734e97e7378e30fc2c89 Author: Konstantin Belousov AuthorDate: 2025-06-15 21:12:52 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-04 04:57:00 +0000 amd64: express KV4ADDR() using KV5ADDR() (cherry picked from commit 2b09d177bd058ae1d8e03e1d65cf82ab351ae011) --- sys/amd64/include/pmap.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h index 7ef826c19fe7..76cc122d6b8a 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -113,12 +113,7 @@ * Pte related macros. This is complicated by having to deal with * the sign extension of the 48th bit. */ -#define KV4ADDR(l4, l3, l2, l1) ( \ - ((unsigned long)-1 << 47) | \ - ((unsigned long)(l4) << PML4SHIFT) | \ - ((unsigned long)(l3) << PDPSHIFT) | \ - ((unsigned long)(l2) << PDRSHIFT) | \ - ((unsigned long)(l1) << PAGE_SHIFT)) +#define KV4ADDR(l4, l3, l2, l1) KV5ADDR(-1, l4, l3, l2, l1) #define KV5ADDR(l5, l4, l3, l2, l1) ( \ ((unsigned long)-1 << 56) | \ ((unsigned long)(l5) << PML5SHIFT) | \