git: 661e2b8e1486 - releng/13.0 - ddb: fix show devmap output on 32-bit arm

Mitchell Horne mhorne at FreeBSD.org
Wed Mar 3 21:55:14 UTC 2021


The branch releng/13.0 has been updated by mhorne:

URL: https://cgit.FreeBSD.org/src/commit/?id=661e2b8e1486cc966304ff98f766463de07e3f02

commit 661e2b8e1486cc966304ff98f766463de07e3f02
Author:     Thomas Skibo <thomas-bsd at skibo.net>
AuthorDate: 2021-01-11 20:58:12 +0000
Commit:     Mitchell Horne <mhorne at FreeBSD.org>
CommitDate: 2021-03-03 21:54:45 +0000

    ddb: fix show devmap output on 32-bit arm
    
    The output has been broken since 1b6dd6d772ca. Casting to uintmax_t
    before the call to printf is necessary to ensure that 32-bit addresses
    are interpreted correctly.
    
    PR:             243236
    Approved by:    re (gjb)
    
    (cherry picked from commit 9976b42b697ce203b1d257b2a6fe64c8a2961645)
    (cherry picked from commit 0a223cf980b5ef8bea726a843fe5a7faf2278330)
---
 sys/kern/subr_devmap.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/kern/subr_devmap.c b/sys/kern/subr_devmap.c
index 8e07199b7f73..23baceb05129 100644
--- a/sys/kern/subr_devmap.c
+++ b/sys/kern/subr_devmap.c
@@ -74,7 +74,9 @@ devmap_dump_table(int (*prfunc)(const char *, ...))
 	prfunc("Static device mappings:\n");
 	for (pd = devmap_table; pd->pd_size != 0; ++pd) {
 		prfunc("  0x%08jx - 0x%08jx mapped at VA 0x%08jx\n",
-		    pd->pd_pa, pd->pd_pa + pd->pd_size - 1, pd->pd_va);
+		    (uintmax_t)pd->pd_pa,
+		    (uintmax_t)(pd->pd_pa + pd->pd_size - 1),
+		    (uintmax_t)pd->pd_va);
 	}
 }
 


More information about the dev-commits-src-all mailing list