[src/trunk]: src/sys/arch/x86 Convert arch/x86 to use <sys/rnd*.h>. Omit nee...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/72e6a89f4ae0
branches:  trunk
changeset: 337370:72e6a89f4ae0
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Apr 13 16:03:51 2015 +0000

description:
Convert arch/x86 to use <sys/rnd*.h>.  Omit needless includes.

diffstat:

 sys/arch/x86/include/via_padlock.h |  4 ++--
 sys/arch/x86/pci/fwhrng.c          |  6 +++---
 sys/arch/x86/x86/ipmi.c            |  6 ++----
 sys/arch/x86/x86/via_padlock.c     |  8 +++-----
 4 files changed, 10 insertions(+), 14 deletions(-)

diffs (110 lines):

diff -r ffcf75f0df76 -r 72e6a89f4ae0 sys/arch/x86/include/via_padlock.h
--- a/sys/arch/x86/include/via_padlock.h        Mon Apr 13 16:02:48 2015 +0000
+++ b/sys/arch/x86/include/via_padlock.h        Mon Apr 13 16:03:51 2015 +0000
@@ -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>
 
diff -r ffcf75f0df76 -r 72e6a89f4ae0 sys/arch/x86/pci/fwhrng.c
--- a/sys/arch/x86/pci/fwhrng.c Mon Apr 13 16:02:48 2015 +0000
+++ b/sys/arch/x86/pci/fwhrng.c Mon Apr 13 16:03:51 2015 +0000
@@ -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>
 
diff -r ffcf75f0df76 -r 72e6a89f4ae0 sys/arch/x86/x86/ipmi.c
--- a/sys/arch/x86/x86/ipmi.c   Mon Apr 13 16:02:48 2015 +0000
+++ b/sys/arch/x86/x86/ipmi.c   Mon Apr 13 16:03:51 2015 +0000
@@ -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 @@
 #include <sys/kthread.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
-#include <sys/rnd.h>
 
 #include <x86/smbiosvar.h>
 
@@ -89,7 +88,6 @@
        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;
diff -r ffcf75f0df76 -r 72e6a89f4ae0 sys/arch/x86/x86/via_padlock.c
--- a/sys/arch/x86/x86/via_padlock.c    Mon Apr 13 16:02:48 2015 +0000
+++ b/sys/arch/x86/x86/via_padlock.c    Mon Apr 13 16:03:51 2015 +0000
@@ -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 @@
 #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>