[src/trunk]: src/sys/dev/usb fix 32-bit debug build, and also vmstat -y. rep...

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

details:   https://anonhg.NetBSD.org/src/rev/fe85c0cbc23f
branches:  trunk
changeset: 965242:fe85c0cbc23f
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Sep 07 22:20:42 2019 +0000

description:
fix 32-bit debug build, and also vmstat -y.  reported by sc.dying.

diffstat:

 sys/dev/usb/xhci.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r da582cb5386d -r fe85c0cbc23f sys/dev/usb/xhci.c
--- a/sys/dev/usb/xhci.c        Sat Sep 07 20:49:57 2019 +0000
+++ b/sys/dev/usb/xhci.c        Sat Sep 07 22:20:42 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xhci.c,v 1.111 2019/08/28 07:09:52 mrg Exp $   */
+/*     $NetBSD: xhci.c,v 1.112 2019/09/07 22:20:42 mrg Exp $   */
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.111 2019/08/28 07:09:52 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.112 2019/09/07 22:20:42 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -2885,8 +2885,12 @@
        usbd_status err;
 
        XHCIHIST_FUNC();
-       XHCIHIST_CALLARGS("icp %jx slot %jx %sbsr",
-           icp, slot_id, bsr ? "" : "no ", 0);
+       if (bsr)
+               XHCIHIST_CALLARGS("icp %jx slot %jx with bsr",
+                   icp, slot_id, 0, 0);
+       else
+               XHCIHIST_CALLARGS("icp %jx slot %jx nobsr",
+                   icp, slot_id, 0, 0);
 
        trb.trb_0 = icp;
        trb.trb_2 = 0;