From 446b48294136b34a58946cc1134b2f60035bc00a Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Sat, 29 Sep 2018 13:16:27 +0200
Subject: [PATCH] <sys/random.h>: Further cleanup.

* Remove inclusion of <sys/interrupt.h> which is no longer needed since
  7e071e7abb9f0b54413dda805a4239f7b0eb455e. It can now be moved to
  kern_memio.c.

* Remove forward declaration of struct thread which is no longer needed
  since fef8985e09e16aeee4a2014876e2e4b758656ac2.

* Fix a typo in a comment (Reported-by: aly).
---
 sys/kern/kern_memio.c | 1 +
 sys/sys/random.h      | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/sys/kern/kern_memio.c b/sys/kern/kern_memio.c
index 0b1e3e2baa..4d6a70fe7d 100644
--- a/sys/kern/kern_memio.c
+++ b/sys/kern/kern_memio.c
@@ -47,6 +47,7 @@
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/filio.h>
+#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
diff --git a/sys/sys/random.h b/sys/sys/random.h
index 812855d953..d596c7ef6b 100644
--- a/sys/sys/random.h
+++ b/sys/sys/random.h
@@ -41,7 +41,7 @@
 
 /*
  * Many kernel routines will have a use for good random numbers,
- * for example, for truely random TCP sequence numbers, which prevent
+ * for example, for truly random TCP sequence numbers, which prevent
  * certain forms of TCP spoofing attacks.
  * 
  */
@@ -52,9 +52,6 @@
 #ifndef _SYS_TYPES_H_
 #include <sys/types.h>
 #endif
-#ifndef _SYS_INTERRUPT_H_
-#include <sys/interrupt.h>
-#endif
 #ifndef _SYS_IOCCOM_H_
 #include <sys/ioccom.h>
 #endif
@@ -98,7 +95,6 @@ int add_buffer_randomness_src(const char *, int, int srcid);
 
 u_int read_random(void *buf, u_int size);
 u_int read_random_unlimited(void *buf, u_int size);
-struct thread;
 struct knote;
 int random_filter_read(struct knote *kn, long hint);
 
-- 
2.11.4.GIT