Module Name: src
Committed By: mrg
Date: Sat Sep 7 22:20:42 UTC 2019
Modified Files:
src/sys/dev/usb: xhci.c
Log Message:
fix 32-bit debug build, and also vmstat -y. reported by sc.dying.
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sys/dev/usb/xhci.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/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.111 src/sys/dev/usb/xhci.c:1.112
--- src/sys/dev/usb/xhci.c:1.111 Wed Aug 28 07:09:52 2019
+++ src/sys/dev/usb/xhci.c Sat Sep 7 22:20:42 2019
@@ -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 @@ xhci_address_device(struct xhci_softc *
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;
