Module Name: src
Committed By: hannken
Date: Thu Dec 23 17:09:25 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ttm.c
src/sys/external/bsd/drm2/dist/drm/ttm: ttm_bo.c
Log Message:
Cast addr to uint64_t before printing.
Ok: riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c
cvs rdiff -u -r1.29 -r1.30 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.23 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.24
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.23 Sun Dec 19 12:23:58 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c Thu Dec 23 17:09:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_ttm.c,v 1.23 2021/12/19 12:23:58 riastradh Exp $ */
+/* $NetBSD: radeon_ttm.c,v 1.24 2021/12/23 17:09:25 hannken Exp $ */
/*
* Copyright 2009 Jerome Glisse.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.23 2021/12/19 12:23:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.24 2021/12/23 17:09:25 hannken Exp $");
#include <linux/dma-mapping.h>
#include <linux/pagemap.h>
@@ -446,8 +446,8 @@ static int radeon_ttm_io_mem_reserve(str
mem->bus.base = rdev->mc.agp_base;
mem->bus.is_iomem = !rdev->ddev->agp->cant_use_aperture;
KASSERTMSG((mem->bus.base & (PAGE_SIZE - 1)) == 0,
- "agp aperture is not page-aligned: %lx",
- mem->bus.base);
+ "agp aperture is not page-aligned: %" PRIx64 "",
+ (uint64_t)mem->bus.base);
KASSERT((mem->bus.offset & (PAGE_SIZE - 1)) == 0);
}
#endif
@@ -485,8 +485,8 @@ static int radeon_ttm_io_mem_reserve(str
rdev->ddev->hose->dense_mem_base;
#endif
KASSERTMSG((mem->bus.base & (PAGE_SIZE - 1)) == 0,
- "mc aperture is not page-aligned: %lx",
- mem->bus.base);
+ "mc aperture is not page-aligned: %" PRIx64 "",
+ (uint64_t)mem->bus.base);
KASSERT((mem->bus.offset & (PAGE_SIZE - 1)) == 0);
break;
default:
Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.29 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.30
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.29 Sun Dec 19 12:40:44 2021
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c Thu Dec 23 17:09:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo.c,v 1.29 2021/12/19 12:40:44 riastradh Exp $ */
+/* $NetBSD: ttm_bo.c,v 1.30 2021/12/23 17:09:25 hannken Exp $ */
/* SPDX-License-Identifier: GPL-2.0 OR MIT */
/**************************************************************************
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.29 2021/12/19 12:40:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.30 2021/12/23 17:09:25 hannken Exp $");
#define pr_fmt(fmt) "[TTM] " fmt
@@ -1838,8 +1838,8 @@ void ttm_bo_unmap_virtual_locked(struct
paddr_t start, end, pa;
KASSERTMSG((bo->mem.bus.base & (PAGE_SIZE - 1)) == 0,
- "bo bus base addr not page-aligned: %lx",
- bo->mem.bus.base);
+ "bo bus base addr not page-aligned: %" PRIx64 "",
+ (uint64_t)bo->mem.bus.base);
KASSERTMSG((bo->mem.bus.offset & (PAGE_SIZE - 1)) == 0,
"bo bus offset not page-aligned: %lx",
bo->mem.bus.offset);
