Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix UVMHIST builds for kernels that don't include usb

This commit is contained in:
skrll 2016-06-23 07:32:12 +00:00
parent b8fd0470b4
commit 70699ce203
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/conf/files
View File

@ -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
@ -193,6 +193,14 @@ defflag opt_kernhist.h KERNHIST KERNHIST_PRINT
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
#

6
sys/dev/usb/files.usb
View File

@ -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

9
sys/kern/kern_history.c
View File

@ -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