Tue Apr 14 20:32:36 2015 UTC ()
Include <sys/rndsource.h> where it is actually used.
I had removed <sys/rnd.h> from files that didn't mention anything of
the rnd(9) API. But they included other files which assumed
<sys/rnd.h> had already been included.
(riastradh)
diff -r1.5 -r1.6 src/sys/arch/arm/at91/at91dbguvar.h
diff -r1.6 -r1.7 src/sys/arch/arm/at91/at91usartvar.h
diff -r1.7 -r1.8 src/sys/arch/arm/ep93xx/epcomvar.h
diff -r1.13 -r1.14 src/sys/arch/arm/s3c2xx0/sscom_var.h
diff -r1.3 -r1.4 src/sys/arch/arm/samsung/sscom_var.h
diff -r1.22 -r1.23 src/sys/arch/hp300/dev/rdvar.h
diff -r1.15 -r1.16 src/sys/arch/xen/include/xbdvar.h
diff -r1.8 -r1.9 src/sys/dev/ic/mb86950var.h
diff -r1.12 -r1.13 src/sys/dev/marvell/if_gfevar.h
diff -r1.17 -r1.18 src/sys/dev/mca/edvar.h
diff -r1.11 -r1.12 src/sys/dev/pci/hifn7751var.h
diff -r1.17 -r1.18 src/sys/dev/pci/if_bgevar.h
diff -r1.4 -r1.5 src/sys/dev/pci/if_casvar.h
diff -r1.3 -r1.4 src/sys/dev/pci/if_vtevar.h
diff -r1.31 -r1.32 src/sys/dev/scsipi/cdvar.h
diff -r1.25 -r1.26 src/sys/dev/usb/if_auereg.h
diff -r1.1 -r1.2 src/sys/dev/usb/if_axenreg.h
diff -r1.16 -r1.17 src/sys/dev/usb/if_axereg.h
diff -r1.18 -r1.19 src/sys/dev/usb/if_kuereg.h
diff -r1.3 -r1.4 src/sys/dev/usb/if_smscvar.h
diff -r1.9 -r1.10 src/sys/dev/usb/if_udavreg.h
diff -r1.9 -r1.10 src/sys/dev/usb/if_urlreg.h
--- src/sys/arch/arm/at91/at91dbguvar.h 2012/02/02 19:42:57 1.5
+++ src/sys/arch/arm/at91/at91dbguvar.h 2015/04/14 20:32:35 1.6
@@ -1,4 +1,4 @@
-/* $NetBSD: at91dbguvar.h,v 1.5 2012/02/02 19:42:57 tls Exp $ */
+/* $NetBSD: at91dbguvar.h,v 1.6 2015/04/14 20:32:35 riastradh Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy
@@ -30,6 +30,10 @@
#define _AT91DBGUVAR_H_
#include <sys/tty.h>
+
+#ifdef RND_COM
+#include <sys/rndsource.h>
+#endif
/* Hardware flag masks */
#define COM_HW_NOIEN 0x01
--- src/sys/arch/arm/at91/at91usartvar.h 2012/11/12 18:00:36 1.6
+++ src/sys/arch/arm/at91/at91usartvar.h 2015/04/14 20:32:35 1.7
@@ -1,4 +1,4 @@
-/* $NetBSD: at91usartvar.h,v 1.6 2012/11/12 18:00:36 skrll Exp $ */
+/* $NetBSD: at91usartvar.h,v 1.7 2015/04/14 20:32:35 riastradh Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -31,6 +31,9 @@
#include <sys/tty.h>
#include <arm/at91/at91pdcvar.h>
+#ifdef RND_COM
+#include <sys/rndsource.h>
+#endif
/* Hardware flag masks */
#define COM_HW_NOIEN 0x01
--- src/sys/arch/arm/ep93xx/epcomvar.h 2012/10/27 17:17:37 1.7
+++ src/sys/arch/arm/ep93xx/epcomvar.h 2015/04/14 20:32:35 1.8
@@ -1,4 +1,4 @@
-/* $NetBSD: epcomvar.h,v 1.7 2012/10/27 17:17:37 chs Exp $ */
+/* $NetBSD: epcomvar.h,v 1.8 2015/04/14 20:32:35 riastradh Exp $ */
/*-
* Copyright (c) 2004 Jesse Off
*
@@ -27,6 +27,10 @@
#ifndef _EPCOMVAR_H_
#define _EPCOMVAR_H_
+
+#ifdef RND_COM
+#include <sys/rndsource.h>
+#endif
/* Hardware flag masks */
#define COM_HW_NOIEN 0x01
--- src/sys/arch/arm/s3c2xx0/sscom_var.h 2014/03/14 21:40:48 1.13
+++ src/sys/arch/arm/s3c2xx0/sscom_var.h 2015/04/14 20:32:35 1.14
@@ -1,4 +1,4 @@
-/* $NetBSD: sscom_var.h,v 1.13 2014/03/14 21:40:48 matt Exp $ */
+/* $NetBSD: sscom_var.h,v 1.14 2015/04/14 20:32:35 riastradh Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -76,6 +76,9 @@
#include <sys/termios.h>
#include <sys/callout.h>
#include <sys/bus.h>
+#ifdef RND_COM
+#include <sys/rndsource.h>
+#endif
#ifdef SSCOM_S3C2410
#include <arm/s3c2xx0/s3c2410reg.h>
--- src/sys/arch/arm/samsung/Attic/sscom_var.h 2014/04/16 21:28:51 1.3
+++ src/sys/arch/arm/samsung/Attic/sscom_var.h 2015/04/14 20:32:35 1.4
@@ -1,4 +1,4 @@
-/* $NetBSD: sscom_var.h,v 1.3 2014/04/16 21:28:51 reinoud Exp $ */
+/* $NetBSD: sscom_var.h,v 1.4 2015/04/14 20:32:35 riastradh Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -76,6 +76,9 @@
#include <sys/termios.h>
#include <sys/callout.h>
#include <sys/bus.h>
+#ifdef RND_COM
+#include <sys/rndsource.h>
+#endif
#include <arm/samsung/sscom_reg.h>
--- src/sys/arch/hp300/dev/rdvar.h 2012/02/02 19:42:59 1.22
+++ src/sys/arch/hp300/dev/rdvar.h 2015/04/14 20:32:35 1.23
@@ -1,4 +1,4 @@
-/* $NetBSD: rdvar.h,v 1.22 2012/02/02 19:42:59 tls Exp $ */
+/* $NetBSD: rdvar.h,v 1.23 2015/04/14 20:32:35 riastradh Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,6 +39,7 @@
*/
#include <sys/callout.h>
+#include <sys/rndsource.h>
struct rdidentinfo {
short ri_hwid; /* 2 byte HW id */
--- src/sys/arch/xen/include/xbdvar.h 2014/03/20 06:48:54 1.15
+++ src/sys/arch/xen/include/xbdvar.h 2015/04/14 20:32:35 1.16
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdvar.h,v 1.15 2014/03/20 06:48:54 skrll Exp $ */
+/* $NetBSD: xbdvar.h,v 1.16 2015/04/14 20:32:35 riastradh Exp $ */
/*
*
@@ -29,6 +29,8 @@
#ifndef _XEN_XBDVAR_H_
#define _XEN_XBDVAR_H_
+
+#include <sys/rndsource.h>
struct xbd_softc {
device_t sc_dev; /* base device glue */
--- src/sys/dev/ic/mb86950var.h 2012/10/27 17:18:21 1.8
+++ src/sys/dev/ic/mb86950var.h 2015/04/14 20:32:35 1.9
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86950var.h,v 1.8 2012/10/27 17:18:21 chs Exp $ */
+/* $NetBSD: mb86950var.h,v 1.9 2015/04/14 20:32:35 riastradh Exp $ */
/*
* Copyright (c) 1995 Mika Kortelainen
@@ -29,6 +29,8 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
+#include <sys/rndsource.h>
/*
* Adapted from if_qnreg.h for the amiga port of NetBSD by Dave J. Barnes, 2004.
--- src/sys/dev/marvell/if_gfevar.h 2012/02/02 19:43:04 1.12
+++ src/sys/dev/marvell/if_gfevar.h 2015/04/14 20:32:36 1.13
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gfevar.h,v 1.12 2012/02/02 19:43:04 tls Exp $ */
+/* $NetBSD: if_gfevar.h,v 1.13 2015/04/14 20:32:36 riastradh Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -38,6 +38,8 @@
*/
#ifndef _IF_GFEVAR_H_
#define _IF_GFEVAR_H_
+
+#include <sys/rndsource.h>
#define GE_RXDESC_MEMSIZE (1 * PAGE_SIZE)
#define GE_RXDESC_MAX 64
--- src/sys/dev/mca/edvar.h 2014/03/20 06:48:54 1.17
+++ src/sys/dev/mca/edvar.h 2015/04/14 20:32:36 1.18
@@ -1,4 +1,4 @@
-/* $NetBSD: edvar.h,v 1.17 2014/03/20 06:48:54 skrll Exp $ */
+/* $NetBSD: edvar.h,v 1.18 2015/04/14 20:32:36 riastradh Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,6 +30,7 @@
*/
#include <sys/mutex.h>
+#include <sys/rndsource.h>
struct edc_mca_softc;
--- src/sys/dev/pci/hifn7751var.h 2014/01/03 16:09:22 1.11
+++ src/sys/dev/pci/hifn7751var.h 2015/04/14 20:32:36 1.12
@@ -1,4 +1,4 @@
-/* $NetBSD: hifn7751var.h,v 1.11 2014/01/03 16:09:22 pgoyette Exp $ */
+/* $NetBSD: hifn7751var.h,v 1.12 2015/04/14 20:32:36 riastradh Exp $ */
/* $OpenBSD: hifn7751var.h,v 1.18 2000/06/02 22:36:45 deraadt Exp $ */
/*
@@ -44,6 +44,8 @@
#define __DEV_PCI_HIFN7751VAR_H__
#ifdef _KERNEL
+
+#include <sys/rndsource.h>
/*
* Some configurable values for the driver
--- src/sys/dev/pci/if_bgevar.h 2013/10/31 04:26:40 1.17
+++ src/sys/dev/pci/if_bgevar.h 2015/04/14 20:32:36 1.18
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bgevar.h,v 1.17 2013/10/31 04:26:40 msaitoh Exp $ */
+/* $NetBSD: if_bgevar.h,v 1.18 2015/04/14 20:32:36 riastradh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
@@ -67,6 +67,7 @@
#define _DEV_PCI_IF_BGEVAR_H_
#include <sys/bus.h>
+#include <sys/rndsource.h>
#include <net/if_ether.h>
#include <dev/pci/pcivar.h>
--- src/sys/dev/pci/if_casvar.h 2012/02/02 19:43:05 1.4
+++ src/sys/dev/pci/if_casvar.h 2015/04/14 20:32:36 1.5
@@ -1,4 +1,4 @@
-/* $NetBSD: if_casvar.h,v 1.4 2012/02/02 19:43:05 tls Exp $ */
+/* $NetBSD: if_casvar.h,v 1.5 2015/04/14 20:32:36 riastradh Exp $ */
/* $OpenBSD: if_casvar.h,v 1.6 2009/06/13 12:18:58 kettenis Exp $ */
/*
@@ -36,6 +36,7 @@
#include <sys/queue.h>
#include <sys/callout.h>
+#include <sys/rndsource.h>
/*
* Misc. definitions for Sun Cassini ethernet controllers.
--- src/sys/dev/pci/if_vtevar.h 2012/02/02 19:43:05 1.3
+++ src/sys/dev/pci/if_vtevar.h 2015/04/14 20:32:36 1.4
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vtevar.h,v 1.3 2012/02/02 19:43:05 tls Exp $ */
+/* $NetBSD: if_vtevar.h,v 1.4 2015/04/14 20:32:36 riastradh Exp $ */
/*-
* Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -31,6 +31,8 @@
#ifndef _IF_VTEVAR_H
#define _IF_VTEVAR_H
+
+#include <sys/rndsource.h>
#define VTE_TX_RING_CNT 64
#define VTE_TX_RING_ALIGN 16
--- src/sys/dev/scsipi/cdvar.h 2012/02/02 19:43:06 1.31
+++ src/sys/dev/scsipi/cdvar.h 2015/04/14 20:32:36 1.32
@@ -1,4 +1,4 @@
-/* $NetBSD: cdvar.h,v 1.31 2012/02/02 19:43:06 tls Exp $ */
+/* $NetBSD: cdvar.h,v 1.32 2015/04/14 20:32:36 riastradh Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -23,6 +23,8 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
+#include <sys/rndsource.h>
#define CDRETRIES 4
--- src/sys/dev/usb/if_auereg.h 2012/02/02 19:43:07 1.25
+++ src/sys/dev/usb/if_auereg.h 2015/04/14 20:32:36 1.26
@@ -1,4 +1,4 @@
-/* $NetBSD: if_auereg.h,v 1.25 2012/02/02 19:43:07 tls Exp $ */
+/* $NetBSD: if_auereg.h,v 1.26 2015/04/14 20:32:36 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -46,6 +46,8 @@
* transfer is denoted by having a length less that 64 bytes. For
* the RX case, the data includes an optional RX status word.
*/
+
+#include <sys/rndsource.h>
#define AUE_UR_READREG 0xF0
#define AUE_UR_WRITEREG 0xF1
--- src/sys/dev/usb/if_axenreg.h 2013/10/26 09:16:20 1.1
+++ src/sys/dev/usb/if_axenreg.h 2015/04/14 20:32:36 1.2
@@ -1,10 +1,12 @@
-/* $NetBSD: if_axenreg.h,v 1.1 2013/10/26 09:16:20 nonaka Exp $ */
+/* $NetBSD: if_axenreg.h,v 1.2 2015/04/14 20:32:36 riastradh Exp $ */
/* $OpenBSD: if_axenreg.h,v 1.1 2013/10/07 05:37:41 yuo Exp $ */
/*
* Copyright (c) 2013 Yojiro UO <yuo@openbsd.org>. All right reserved.
*
*/
+
+#include <sys/rndsource.h>
/*
* Definitions for the ASIX Electronics AX88179 to ethernet controller.
--- src/sys/dev/usb/if_axereg.h 2013/11/08 17:46:35 1.16
+++ src/sys/dev/usb/if_axereg.h 2015/04/14 20:32:36 1.17
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axereg.h,v 1.16 2013/11/08 17:46:35 roy Exp $ */
+/* $NetBSD: if_axereg.h,v 1.17 2015/04/14 20:32:36 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003
@@ -38,6 +38,7 @@
* Definitions for the ASIX Electronics AX88172 to ethernet controller.
*/
+#include <sys/rndsource.h>
/*
* Vendor specific commands
--- src/sys/dev/usb/if_kuereg.h 2012/02/02 19:43:07 1.18
+++ src/sys/dev/usb/if_kuereg.h 2015/04/14 20:32:36 1.19
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kuereg.h,v 1.18 2012/02/02 19:43:07 tls Exp $ */
+/* $NetBSD: if_kuereg.h,v 1.19 2015/04/14 20:32:36 riastradh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -40,6 +40,8 @@
* microcontroller. The one exception is the 'send scan data' command,
* which is used to load the firmware.
*/
+
+#include <sys/rndsource.h>
#define KUE_CONFIG_NO 1
#define KUE_IFACE_IDX 0
--- src/sys/dev/usb/Attic/if_smscvar.h 2014/06/09 14:18:28 1.3
+++ src/sys/dev/usb/Attic/if_smscvar.h 2015/04/14 20:32:36 1.4
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smscvar.h,v 1.3 2014/06/09 14:18:28 mlelstv Exp $ */
+/* $NetBSD: if_smscvar.h,v 1.4 2015/04/14 20:32:36 riastradh Exp $ */
/* $OpenBSD: if_smscreg.h,v 1.2 2012/09/27 12:38:11 jsg Exp $ */
/*-
@@ -31,6 +31,8 @@
*/
#ifndef _IF_SMSCVAR_H_
#define _IF_SMSCVAR_H_
+
+#include <sys/rndsource.h>
struct smsc_chain {
struct smsc_softc *sc_sc;
--- src/sys/dev/usb/if_udavreg.h 2012/08/24 09:01:23 1.9
+++ src/sys/dev/usb/if_udavreg.h 2015/04/14 20:32:36 1.10
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udavreg.h,v 1.9 2012/08/24 09:01:23 msaitoh Exp $ */
+/* $NetBSD: if_udavreg.h,v 1.10 2015/04/14 20:32:36 riastradh Exp $ */
/* $nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $ */
/*
* Copyright (c) 2003
@@ -29,6 +29,8 @@
* SUCH DAMAGE.
*
*/
+
+#include <sys/rndsource.h>
#define UDAV_IFACE_INDEX 0
#define UDAV_CONFIG_NO 1
--- src/sys/dev/usb/if_urlreg.h 2012/08/24 09:01:23 1.9
+++ src/sys/dev/usb/if_urlreg.h 2015/04/14 20:32:36 1.10
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urlreg.h,v 1.9 2012/08/24 09:01:23 msaitoh Exp $ */
+/* $NetBSD: if_urlreg.h,v 1.10 2015/04/14 20:32:36 riastradh Exp $ */
/*
* Copyright (c) 2001, 2002
* Shingo WATANABE <nabe@nabechan.org>. All rights reserved.
@@ -28,6 +28,8 @@
* SUCH DAMAGE.
*
*/
+
+#include <sys/rndsource.h>
#define URL_IFACE_INDEX 0
#define URL_CONFIG_NO 1