Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/drm2/dist/drm Cast addr to uint64_t before ...
details: https://anonhg.NetBSD.org/src/rev/516596f48971
branches: trunk
changeset: 1029148:516596f48971
user: hannken <hannken%NetBSD.org@localhost>
date: Thu Dec 23 17:09:25 2021 +0000
description:
Cast addr to uint64_t before printing.
Ok: riastradh@
diffstat:
sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c | 12 ++++++------
sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
diffs (69 lines):
diff -r 3032dc708516 -r 516596f48971 sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c Thu Dec 23 17:05:49 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c Thu Dec 23 17:09:25 2021 +0000
@@ -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 @@
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 @@
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:
diff -r 3032dc708516 -r 516596f48971 sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
--- a/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c Thu Dec 23 17:05:49 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c Thu Dec 23 17:09:25 2021 +0000
@@ -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 @@
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);
Home |
Main Index |
Thread Index |
Old Index