The branch stable/14 has been updated by kib:
URL:
https://cgit.FreeBSD.org/src/commit/?id=b6fb125330dd4c079ebb734e97e7378e30fc2c89
commit b6fb125330dd4c079ebb734e97e7378e30fc2c89
Author: Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2025-06-15 21:12:52 +0000
Commit: Konstantin Belousov <k...@freebsd.org>
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) | \
