Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:56:50 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_mm.c
Log Message:
<asm/div64.h> for do_div. Fix some 64-bit printfs.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/drm_mm.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/drm_mm.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_mm.c:1.4 src/sys/external/bsd/drm2/dist/drm/drm_mm.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/drm_mm.c:1.4 Mon Aug 27 04:58:19 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_mm.c Mon Aug 27 06:56:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_mm.c,v 1.4 2018/08/27 04:58:19 riastradh Exp $ */
+/* $NetBSD: drm_mm.c,v 1.5 2018/08/27 06:56:50 riastradh Exp $ */
/**************************************************************************
*
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_mm.c,v 1.4 2018/08/27 04:58:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_mm.c,v 1.5 2018/08/27 06:56:50 riastradh Exp $");
#include <drm/drmP.h>
#include <drm/drm_mm.h>
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_mm.c,v 1
#include <linux/export.h>
#include <linux/printk.h>
#include <asm/bug.h>
+#include <asm/div64.h>
/**
* DOC: Overview
@@ -786,7 +787,7 @@ static u64 drm_mm_debug_hole(struct drm_
hole_start = drm_mm_hole_node_start(entry);
hole_end = drm_mm_hole_node_end(entry);
hole_size = hole_end - hole_start;
- pr_debug("%s %#llx-%#llx: %llu: free\n", prefix, hole_start,
+ pr_debug("%s %#"PRIx64"-%#"PRIx64": %"PRIu64": free\n", prefix, hole_start,
hole_end, hole_size);
return hole_size;
}
@@ -807,14 +808,14 @@ void drm_mm_debug_table(struct drm_mm *m
total_free += drm_mm_debug_hole(&mm->head_node, prefix);
drm_mm_for_each_node(entry, mm) {
- pr_debug("%s %#llx-%#llx: %llu: used\n", prefix, entry->start,
+ pr_debug("%s %#"PRIx64"-%#"PRIx64": %"PRIu64": used\n", prefix, entry->start,
entry->start + entry->size, entry->size);
total_used += entry->size;
total_free += drm_mm_debug_hole(entry, prefix);
}
total = total_free + total_used;
- pr_debug("%s total: %llu, used %llu free %llu\n", prefix, total,
+ pr_debug("%s total: %"PRIu64", used %"PRIu64" free %"PRIu64"\n", prefix, total,
total_used, total_free);
}
EXPORT_SYMBOL(drm_mm_debug_table);
