Module Name: src
Committed By: riastradh
Date: Mon Apr 13 16:03:51 UTC 2015
Modified Files:
src/sys/arch/x86/include: via_padlock.h
src/sys/arch/x86/pci: fwhrng.c
src/sys/arch/x86/x86: ipmi.c via_padlock.c
Log Message:
Convert arch/x86 to use <sys/rnd*.h>. Omit needless includes.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x86/include/via_padlock.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x86/pci/fwhrng.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/x86/x86/ipmi.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/x86/x86/via_padlock.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/arch/x86/include/via_padlock.h
diff -u src/sys/arch/x86/include/via_padlock.h:1.7 src/sys/arch/x86/include/via_padlock.h:1.8
--- src/sys/arch/x86/include/via_padlock.h:1.7 Sat Nov 19 22:51:21 2011
+++ src/sys/arch/x86/include/via_padlock.h Mon Apr 13 16:03:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: via_padlock.h,v 1.7 2011/11/19 22:51:21 tls Exp $ */
+/* $NetBSD: via_padlock.h,v 1.8 2015/04/13 16:03:51 riastradh Exp $ */
/*-
* Copyright (c) 2003 Jason Wright
@@ -23,7 +23,7 @@
#if defined(_KERNEL)
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <sys/callout.h>
#include <crypto/rijndael/rijndael.h>
Index: src/sys/arch/x86/pci/fwhrng.c
diff -u src/sys/arch/x86/pci/fwhrng.c:1.8 src/sys/arch/x86/pci/fwhrng.c:1.9
--- src/sys/arch/x86/pci/fwhrng.c:1.8 Sun Nov 16 16:20:00 2014
+++ src/sys/arch/x86/pci/fwhrng.c Mon Apr 13 16:03:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fwhrng.c,v 1.8 2014/11/16 16:20:00 ozaki-r Exp $ */
+/* $NetBSD: fwhrng.c,v 1.9 2015/04/13 16:03:51 riastradh Exp $ */
/*
* Copyright (c) 2000 Michael Shalayeff
@@ -29,13 +29,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwhrng.c,v 1.8 2014/11/16 16:20:00 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwhrng.c,v 1.9 2015/04/13 16:03:51 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/time.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <sys/bus.h>
Index: src/sys/arch/x86/x86/ipmi.c
diff -u src/sys/arch/x86/x86/ipmi.c:1.60 src/sys/arch/x86/x86/ipmi.c:1.61
--- src/sys/arch/x86/x86/ipmi.c:1.60 Mon Dec 29 14:00:26 2014
+++ src/sys/arch/x86/x86/ipmi.c Mon Apr 13 16:03:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmi.c,v 1.60 2014/12/29 14:00:26 mlelstv Exp $ */
+/* $NetBSD: ipmi.c,v 1.61 2015/04/13 16:03:51 riastradh Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.60 2014/12/29 14:00:26 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.61 2015/04/13 16:03:51 riastradh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -66,7 +66,6 @@ __KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.6
#include <sys/kthread.h>
#include <sys/bus.h>
#include <sys/intr.h>
-#include <sys/rnd.h>
#include <x86/smbiosvar.h>
@@ -89,7 +88,6 @@ struct ipmi_sensor {
uint32_t i_props, i_defprops;
SLIST_ENTRY(ipmi_sensor) i_list;
int32_t i_prevval; /* feed rnd source on change */
- krndsource_t i_rnd;
};
int ipmi_nintr;
Index: src/sys/arch/x86/x86/via_padlock.c
diff -u src/sys/arch/x86/x86/via_padlock.c:1.23 src/sys/arch/x86/x86/via_padlock.c:1.24
--- src/sys/arch/x86/x86/via_padlock.c:1.23 Sun Nov 16 16:20:00 2014
+++ src/sys/arch/x86/x86/via_padlock.c Mon Apr 13 16:03:51 2015
@@ -1,5 +1,5 @@
/* $OpenBSD: via.c,v 1.8 2006/11/17 07:47:56 tom Exp $ */
-/* $NetBSD: via_padlock.c,v 1.23 2014/11/16 16:20:00 ozaki-r Exp $ */
+/* $NetBSD: via_padlock.c,v 1.24 2015/04/13 16:03:51 riastradh Exp $ */
/*-
* Copyright (c) 2003 Jason Wright
@@ -20,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.23 2014/11/16 16:20:00 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.24 2015/04/13 16:03:51 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -28,12 +28,10 @@ __KERNEL_RCSID(0, "$NetBSD: via_padlock.
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/module.h>
-#include <sys/rnd.h>
+#include <sys/rndsource.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/cpu.h>
-#include <sys/rnd.h>
-#include <sys/cprng.h>
#include <x86/specialreg.h>
