Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/arm32 Revert previous and cast to u_quad_t inst...



details:   https://anonhg.NetBSD.org/src/rev/bad5b3a4a318
branches:  trunk
changeset: 320730:bad5b3a4a318
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jul 17 05:29:07 2018 +0000

description:
Revert previous and cast to u_quad_t instead (t is for ptrdiff_t and off_t
does not match that on all arm)

diffstat:

 sys/arch/arm/arm32/bus_dma.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r b3a4cf81583b -r bad5b3a4a318 sys/arch/arm/arm32/bus_dma.c
--- a/sys/arch/arm/arm32/bus_dma.c      Tue Jul 17 01:47:20 2018 +0000
+++ b/sys/arch/arm/arm32/bus_dma.c      Tue Jul 17 05:29:07 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.109 2018/07/16 23:10:41 christos Exp $   */
+/*     $NetBSD: bus_dma.c,v 1.110 2018/07/17 05:29:07 martin Exp $     */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 #include "opt_cputypes.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.109 2018/07/16 23:10:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.110 2018/07/17 05:29:07 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -1496,7 +1496,7 @@
 
        for (i = 0; i < nsegs; i++) {
                KASSERTMSG((off & PAGE_MASK) == 0,
-                   "off %#tx (%#x)", off, (int)off & PAGE_MASK);
+                   "off %#qx (%#x)", (u_quad_t)off, (int)off & PAGE_MASK);
                KASSERTMSG((segs[i].ds_addr & PAGE_MASK) == 0,
                    "ds_addr %#lx (%#x)", segs[i].ds_addr,
                    (int)segs[i].ds_addr & PAGE_MASK);



Home | Main Index | Thread Index | Old Index