[src/trunk]: src/sys Fix UVMHIST builds for kernels that don't include usb

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

details:   https://anonhg.NetBSD.org/src/rev/fd2718f7ae71
branches:  trunk
changeset: 346081:fd2718f7ae71
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Jun 23 07:32:12 2016 +0000

description:
Fix UVMHIST builds for kernels that don't include usb

diffstat:

 sys/conf/files          |  10 +++++++++-
 sys/dev/usb/files.usb   |   6 +-----
 sys/kern/kern_history.c |   9 ++-------
 3 files changed, 12 insertions(+), 13 deletions(-)

diffs (75 lines):

diff -r 2eaee3c3bae1 -r fd2718f7ae71 sys/conf/files
--- a/sys/conf/files    Thu Jun 23 06:44:52 2016 +0000
+++ b/sys/conf/files    Thu Jun 23 07:32:12 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.1159 2016/05/27 20:01:49 bouyer Exp $
+#      $NetBSD: files,v 1.1160 2016/06/23 07:32:12 skrll Exp $
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
 version        20150846
@@ -194,6 +194,14 @@
 file   kern/kern_history.c             kernhist
 
 #
+# These are here for the benefit of kern_history.c so that
+# UVMHIST can be built in kernels without usb.
+#
+# top level usb debug defines
+defflag        opt_usb.h                       USB_DEBUG: KERNHIST
+defparam opt_usb.h                     USBHIST_SIZE
+
+#
 # System monitoring framework
 #
 include "dev/sysmon/files.sysmon"
diff -r 2eaee3c3bae1 -r fd2718f7ae71 sys/dev/usb/files.usb
--- a/sys/dev/usb/files.usb     Thu Jun 23 06:44:52 2016 +0000
+++ b/sys/dev/usb/files.usb     Thu Jun 23 07:32:12 2016 +0000
@@ -1,16 +1,12 @@
-#      $NetBSD: files.usb,v 1.139 2016/04/26 10:38:43 skrll Exp $
+#      $NetBSD: files.usb,v 1.140 2016/06/23 07:32:12 skrll Exp $
 #
 # Config file and device description for machine-independent USB code.
 # Included by ports that need it.  Ports that use it must provide
 # their own "major" declarations for the appropriate devices.
 
 defflag        USBVERBOSE
-defparam opt_usb.h     USBHIST_SIZE
 defflag        opt_usb.h       USB_FRAG_DMA_WORKAROUND
 
-# top level usb debug defines
-defflag        opt_usb.h       USB_DEBUG: KERNHIST
-
 # HC controllers
 defflag        opt_usb.h       EHCI_DEBUG: USB_DEBUG
 defflag        opt_usb.h       OHCI_DEBUG: USB_DEBUG
diff -r 2eaee3c3bae1 -r fd2718f7ae71 sys/kern/kern_history.c
--- a/sys/kern/kern_history.c   Thu Jun 23 06:44:52 2016 +0000
+++ b/sys/kern/kern_history.c   Thu Jun 23 07:32:12 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_history.c,v 1.5 2016/06/22 07:44:02 skrll Exp $    */
+/*     $NetBSD: kern_history.c,v 1.6 2016/06/23 07:32:12 skrll Exp $    */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_history.c,v 1.5 2016/06/22 07:44:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_history.c,v 1.6 2016/06/23 07:32:12 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kernhist.h"
@@ -46,11 +46,6 @@
 #include <sys/cpu.h>
 #include <sys/kernhist.h>
 
-#include "usb.h"
-#if NUSB == 0
-#undef USB_DEBUG
-#endif
-
 #ifdef UVMHIST
 #include <uvm/uvm.h>
 #endif