diff options
| author | skrll <skrll@NetBSD.org> | 2016-06-23 07:32:12 +0000 |
|---|---|---|
| committer | skrll <skrll@NetBSD.org> | 2016-06-23 07:32:12 +0000 |
| commit | bf7aa39e33a2a32b4c1b684722573ea5ddbb8136 (patch) | |
| tree | 8a06f662ecc133a99dfcb214bdadd853db2dfb08 /sys | |
| parent | 891819d2276c05d70e76a37da8d4c5c71ebf4e28 (diff) | |
Fix UVMHIST builds for kernels that don't include usb
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/files | 10 | ||||
| -rw-r--r-- | sys/dev/usb/files.usb | 6 | ||||
| -rw-r--r-- | sys/kern/kern_history.c | 9 |
3 files changed, 12 insertions, 13 deletions
diff --git a/sys/conf/files b/sys/conf/files index ea576cfc6e2..23dbe253684 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -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 @@ defparam opt_kernhist.h KERNHIST_DELAY 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 --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb index b8b15b26af2..d752710eac9 100644 --- a/sys/dev/usb/files.usb +++ b/sys/dev/usb/files.usb @@ -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 --git a/sys/kern/kern_history.c b/sys/kern/kern_history.c index b6eb9d682e6..d13aa653a63 100644 --- a/sys/kern/kern_history.c +++ b/sys/kern/kern_history.c @@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: kern_history.c,v 1.5 2016/06/22 07:44:02 skrll Exp $ #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 |
