Module Name: src
Committed By: skrll
Date: Sat May 30 06:41:08 UTC 2015
Modified Files:
src/sys/dev/usb: usb.c usbhist.h
Log Message:
Make the non-USBHIST case compile
To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/usbhist.h
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/usb.c
diff -u src/sys/dev/usb/usb.c:1.158 src/sys/dev/usb/usb.c:1.159
--- src/sys/dev/usb/usb.c:1.158 Sat May 30 06:10:38 2015
+++ src/sys/dev/usb/usb.c Sat May 30 06:41:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.158 2015/05/30 06:10:38 skrll Exp $ */
+/* $NetBSD: usb.c,v 1.159 2015/05/30 06:41:08 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.158 2015/05/30 06:10:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.159 2015/05/30 06:41:08 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -277,7 +277,7 @@ usb_once_init(void)
struct usb_taskq *taskq;
int i;
- KERNHIST_LINK_STATIC(usbhist);
+ USBHIST_LINK_STATIC(usbhist);
selinit(&usb_selevent);
mutex_init(&usb_event_lock, MUTEX_DEFAULT, IPL_NONE);
Index: src/sys/dev/usb/usbhist.h
diff -u src/sys/dev/usb/usbhist.h:1.1 src/sys/dev/usb/usbhist.h:1.2
--- src/sys/dev/usb/usbhist.h:1.1 Fri Sep 12 16:40:38 2014
+++ src/sys/dev/usb/usbhist.h Sat May 30 06:41:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usbhist.h,v 1.1 2014/09/12 16:40:38 skrll Exp $ */
+/* $NetBSD: usbhist.h,v 1.2 2015/05/30 06:41:08 skrll Exp $ */
/*
* Copyright (c) 2012 Matthew R. Green
@@ -52,6 +52,7 @@ extern int usbdebug;
#define USBHIST_DEFINE(NAME) KERNHIST_DEFINE(NAME)
#define USBHIST_INIT(NAME,N) KERNHIST_INIT(NAME,N)
#define USBHIST_INIT_STATIC(NAME,BUF) KERNHIST_INIT_STATIC(NAME,BUF)
+#define USBHIST_LINK_STATIC(NAME) KERNHIST_LINK_STATIC(NAME)
#define USBHIST_LOGN(NAME,N,FMT,A,B,C,D) do { \
if ((NAME) >= (N)) { \
KERNHIST_LOG(usbhist,FMT,A,B,C,D); \
@@ -73,6 +74,7 @@ USBHIST_DECL(usbhist);
#define USBHIST_DEFINE(NAME)
#define USBHIST_INIT(NAME,N)
#define USBHIST_INIT_STATIC(NAME,BUF)
+#define USBHIST_LINK_STATIC(NAME)
#define USBHIST_LOGN(N,NAME,FMT,A,B,C,D) do { } while(0)
#define USBHIST_LOG(NAME,FMT,A,B,C,D) do { } while(0)
#define USBHIST_CALLED(NAME)
