[src/nick-nhusb]: src/sys/dev/usb Bring usbhist initialisation change across ...

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

details:   https://anonhg.NetBSD.org/src/rev/f07223acb966
branches:  nick-nhusb
changeset: 334215:f07223acb966
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu May 28 11:55:44 2015 +0000

description:
Bring usbhist initialisation change across from HEAD

diffstat:

 sys/dev/usb/usb.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (42 lines):

diff -r 3170947a1116 -r f07223acb966 sys/dev/usb/usb.c
--- a/sys/dev/usb/usb.c Thu May 28 06:15:47 2015 +0000
+++ b/sys/dev/usb/usb.c Thu May 28 11:55:44 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usb.c,v 1.156.2.7 2015/04/03 21:22:33 skrll Exp $      */
+/*     $NetBSD: usb.c,v 1.156.2.8 2015/05/28 11:55:44 skrll Exp $      */
 
 /*
  * Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.156.2.7 2015/04/03 21:22:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.156.2.8 2015/05/28 11:55:44 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -75,11 +75,13 @@
 
 #if defined(USBHIST)
 
-USBHIST_DEFINE(usbhist);
 #ifndef USBHIST_SIZE
 #define USBHIST_SIZE 50000
 #endif
 
+static struct kern_history_ent usbhistbuf[USBHIST_SIZE];
+USBHIST_DEFINE(usbhist) = KERNHIST_INITIALIZER(usbhist, usbhistbuf);
+
 #endif
 
 #define USB_DEV_MINOR 255
@@ -274,8 +276,6 @@
        struct usb_taskq *taskq;
        int i;
 
-       USBHIST_INIT(usbhist, USBHIST_SIZE);
-
        selinit(&usb_selevent);
        mutex_init(&usb_event_lock, MUTEX_DEFAULT, IPL_NONE);
        cv_init(&usb_event_cv, "usbrea");