git: 975bdb89ecdd - stable/15 - Fix build failure after f02a5391295e
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 12 Oct 2026 16:01:18 UTC
The branch stable/15 has been updated by mchoo:
URL: https://cgit.FreeBSD.org/src/commit/?id=975bdb89ecdd939adcd51b5f9d27ea99939b2cbb
commit 975bdb89ecdd939adcd51b5f9d27ea99939b2cbb
Author: Minsoo Choo <mchoo@FreeBSD.org>
AuthorDate: 2026-10-12 15:52:01 +0000
Commit: Minsoo Choo <mchoo@FreeBSD.org>
CommitDate: 2026-10-12 16:00:32 +0000
Fix build failure after f02a5391295e
On main, casting PHYS_TO_DMAP(pa) does not require casting to pt_entry_t
* because it returns void * after fe3e92e6868d ("PHYS_TO_DMAP: Return a
void * instead of a vm_offset_t"). That was not MFCed to stable/14 and
stable/15, thus cast the return value of PHYS_TO_DMAP(pa) to
pt_entry_t * to fix build failure.
Approved by: jhb (mentor)
Fixes: f02a5391295e ("powerpc/radix: include page tables...")
Sponsored by: FreeBSD Foundation
---
sys/powerpc/aim/mmu_radix.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/powerpc/aim/mmu_radix.c b/sys/powerpc/aim/mmu_radix.c
index 754522e85591..f1f1a06ecd67 100644
--- a/sys/powerpc/aim/mmu_radix.c
+++ b/sys/powerpc/aim/mmu_radix.c
@@ -6248,7 +6248,7 @@ mmu_radix_scan_pmap(struct bitset *dump_bitset)
pa = l1e & RPDE_NLB_MASK;
mmu_radix_dump_add_range(dump_bitset, pa, PAGE_SIZE);
- l2 = PHYS_TO_DMAP(pa);
+ l2 = (pt_entry_t *)PHYS_TO_DMAP(pa);
for (j = 0; j < NL2EPG; j++) {
l2e = be64toh(l2[j]);
if ((l2e & RPTE_VALID) == 0)
@@ -6263,7 +6263,7 @@ mmu_radix_scan_pmap(struct bitset *dump_bitset)
pa = l2e & RPDE_NLB_MASK;
mmu_radix_dump_add_range(dump_bitset, pa, PAGE_SIZE);
- l3 = PHYS_TO_DMAP(pa);
+ l3 = (pt_entry_t *)PHYS_TO_DMAP(pa);
for (k = 0; k < NL3EPG; k++) {
l3e = be64toh(l3[k]);
if ((l3e & RPTE_VALID) == 0)
@@ -6280,7 +6280,7 @@ mmu_radix_scan_pmap(struct bitset *dump_bitset)
pa = l3e & RPDE_NLB_MASK;
mmu_radix_dump_add_range(dump_bitset, pa,
PAGE_SIZE);
- pt = PHYS_TO_DMAP(pa);
+ pt = (pt_entry_t *)PHYS_TO_DMAP(pa);
for (l = 0; l < RPTE_ENTRIES; l++) {
pte = be64toh(pt[l]);
if ((pte & (RPTE_VALID | RPTE_LEAF)) !=