Module Name: src
Committed By: skrll
Date: Thu Jun 23 07:32:12 UTC 2016
Modified Files:
src/sys/conf: files
src/sys/dev/usb: files.usb
src/sys/kern: kern_history.c
Log Message:
Fix UVMHIST builds for kernels that don't include usb
To generate a diff of this commit:
cvs rdiff -u -r1.1159 -r1.1160 src/sys/conf/files
cvs rdiff -u -r1.139 -r1.140 src/sys/dev/usb/files.usb
cvs rdiff -u -r1.5 -r1.6 src/sys/kern/kern_history.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1159 src/sys/conf/files:1.1160
--- src/sys/conf/files:1.1159 Fri May 27 20:01:49 2016
+++ src/sys/conf/files Thu Jun 23 07:32:12 2016
@@ -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"
Index: src/sys/dev/usb/files.usb
diff -u src/sys/dev/usb/files.usb:1.139 src/sys/dev/usb/files.usb:1.140
--- src/sys/dev/usb/files.usb:1.139 Tue Apr 26 10:38:43 2016
+++ src/sys/dev/usb/files.usb Thu Jun 23 07:32:12 2016
@@ -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
Index: src/sys/kern/kern_history.c
diff -u src/sys/kern/kern_history.c:1.5 src/sys/kern/kern_history.c:1.6
--- src/sys/kern/kern_history.c:1.5 Wed Jun 22 07:44:02 2016
+++ src/sys/kern/kern_history.c Thu Jun 23 07:32:12 2016
@@ -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
#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
