[src/trunk]: src/sys/arch Fix DEBUG build.

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/376f9cbf7441
branches:  trunk
changeset: 759431:376f9cbf7441
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu Dec 09 05:14:28 2010 +0000

description:
Fix DEBUG build.

diffstat:

 sys/arch/acorn32/mainbus/fd.c     |  6 +++---
 sys/arch/acorn32/podulebus/esc.c  |  5 +++--
 sys/arch/acorn32/podulebus/sfas.c |  5 +++--
 sys/arch/algor/include/bus.h      |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diffs (97 lines):

diff -r ea6da9097f2c -r 376f9cbf7441 sys/arch/acorn32/mainbus/fd.c
--- a/sys/arch/acorn32/mainbus/fd.c     Thu Dec 09 05:00:14 2010 +0000
+++ b/sys/arch/acorn32/mainbus/fd.c     Thu Dec 09 05:14:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fd.c,v 1.48 2010/11/28 08:23:22 hannken Exp $  */
+/*     $NetBSD: fd.c,v 1.49 2010/12/09 05:14:28 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.48 2010/11/28 08:23:22 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.49 2010/12/09 05:14:28 uebayasi Exp $");
 
 #include "opt_ddb.h"
 
@@ -1452,7 +1452,7 @@
        bp->b_data = (void *)finfo;
 
 #ifdef DEBUG
-       printf("fdformat: blkno %llx count %lx\n",
+       printf("fdformat: blkno %llx count %x\n",
            (unsigned long long)bp->b_blkno, bp->b_bcount);
 #endif
 
diff -r ea6da9097f2c -r 376f9cbf7441 sys/arch/acorn32/podulebus/esc.c
--- a/sys/arch/acorn32/podulebus/esc.c  Thu Dec 09 05:00:14 2010 +0000
+++ b/sys/arch/acorn32/podulebus/esc.c  Thu Dec 09 05:14:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: esc.c,v 1.23 2009/05/16 16:40:58 cegger Exp $  */
+/*     $NetBSD: esc.c,v 1.24 2010/12/09 05:14:48 uebayasi Exp $        */
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -86,7 +86,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.23 2009/05/16 16:40:58 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.24 2010/12/09 05:14:48 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -144,6 +144,7 @@
 u_char esc_inhibit_sync[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 u_char esc_inhibit_disc[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 
+#undef DEBUG
 #define DEBUG
 #ifdef DEBUG
 #define QPRINTF(a) if (esc_debug > 1) printf a
diff -r ea6da9097f2c -r 376f9cbf7441 sys/arch/acorn32/podulebus/sfas.c
--- a/sys/arch/acorn32/podulebus/sfas.c Thu Dec 09 05:00:14 2010 +0000
+++ b/sys/arch/acorn32/podulebus/sfas.c Thu Dec 09 05:14:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sfas.c,v 1.20 2009/05/16 16:40:58 cegger Exp $ */
+/*     $NetBSD: sfas.c,v 1.21 2010/12/09 05:14:48 uebayasi Exp $       */
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfas.c,v 1.20 2009/05/16 16:40:58 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfas.c,v 1.21 2010/12/09 05:14:48 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -137,6 +137,7 @@
 u_char sfas_inhibit_sync[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 u_char sfas_inhibit_disc[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 
+#undef DEBUG
 #define DEBUG
 #ifdef DEBUG
 #define QPRINTF(a) if (sfas_debug > 1) printf a
diff -r ea6da9097f2c -r 376f9cbf7441 sys/arch/algor/include/bus.h
--- a/sys/arch/algor/include/bus.h      Thu Dec 09 05:00:14 2010 +0000
+++ b/sys/arch/algor/include/bus.h      Thu Dec 09 05:14:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus.h,v 1.14 2008/04/28 20:23:10 martin Exp $  */
+/*     $NetBSD: bus.h,v 1.15 2010/12/09 05:15:06 uebayasi Exp $        */
 
 /*-
  * Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
 #define        __BUS_SPACE_ADDRESS_SANITY(p, t, d)                             \
 ({                                                                     \
        if (__BUS_SPACE_ALIGNED_ADDRESS((p), t) == 0) {                 \
-               printf("%s 0x%lx not aligned to %lu bytes %s:%d\n",     \
+               printf("%s 0x%lx not aligned to %zu bytes %s:%d\n",     \
                    d, (u_long)(p), sizeof(t), __FILE__, __LINE__);     \
        }                                                               \
        (void) 0;                                                       \