splat: Cleanup headers

Restructure the the SPLAT headers such that each test only
includes the minimal set of headers it requires.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/include/sys/kmem.h b/include/sys/kmem.h
index 0149e754c33c7ac7031e4f29afb8fd4fba4b550a..e71a443a09eb82f8d6b51ec13c6ce6dfa0a67b77 100644 (file)
--- a/include/sys/kmem.h
+++ b/include/sys/kmem.h
@@ -28,7 +28,6 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
-#include <linux/mm_compat.h>
 #include <linux/spinlock.h>
 #include <linux/rwsem.h>
 #include <linux/hash.h>

diff --git a/include/sys/types.h b/include/sys/types.h
index 0c3d88ec375ebd4243db500cad59eb95ec299165..35905eb9736b69004b752e71070e2978ca405162 100644 (file)
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -42,6 +42,8 @@
 #include <linux/proc_compat.h>
 #include <linux/math64_compat.h>
 #include <linux/zlib_compat.h>
+#include <linux/mm_compat.h>
+#include <linux/delay.h>
 
 #ifndef HAVE_UINTPTR_T
 typedef unsigned long                  uintptr_t;

diff --git a/module/splat/splat-atomic.c b/module/splat/splat-atomic.c
index 6162d6abfe404c2e8e101f1be93d23e7ebee8695..cdb3353f9cddaae2622d3aa30b2714a06c515402 100644 (file)
--- a/module/splat/splat-atomic.c
+++ b/module/splat/splat-atomic.c
@@ -24,6 +24,8 @@
  *  Solaris Porting LAyer Tests (SPLAT) Atomic Tests.
 \*****************************************************************************/
 
+#include <sys/atomic.h>
+#include <sys/thread.h>
 #include "splat-internal.h"
 
 #define SPLAT_ATOMIC_NAME              "atomic"

diff --git a/module/splat/splat-condvar.c b/module/splat/splat-condvar.c
index 14000adbd94268f315b3487509eec99ce78a349d..69fefc95578461585fdbe3d5a2ab3f8d12ac9f21 100644 (file)
--- a/module/splat/splat-condvar.c
+++ b/module/splat/splat-condvar.c
@@ -24,6 +24,7 @@
  *  Solaris Porting LAyer Tests (SPLAT) Condition Variable Tests.
 \*****************************************************************************/
 
+#include <sys/condvar.h>
 #include "splat-internal.h"
 
 #define SPLAT_CONDVAR_NAME             "condvar"

diff --git a/module/splat/splat-cred.c b/module/splat/splat-cred.c
index db36ece980f9594929ea3f4df671ae26ef61d30e..0efabd8541292aa5d74fe568ff9afa6674ce53ab 100644 (file)
--- a/module/splat/splat-cred.c
+++ b/module/splat/splat-cred.c
@@ -24,6 +24,7 @@
  *  Solaris Porting LAyer Tests (SPLAT) Credential Tests.
 \*****************************************************************************/
 
+#include <sys/cred.h>
 #include "splat-internal.h"
 
 #define SPLAT_CRED_NAME                        "cred"

diff --git a/module/splat/splat-ctl.c b/module/splat/splat-ctl.c
index 399b09c4d328ed5cdacf79d6c9d103411a3c4259..53bf51dd629c57af9db66896a81436753d1ae833 100644 (file)
--- a/module/splat/splat-ctl.c
+++ b/module/splat/splat-ctl.c
@@ -43,6 +43,14 @@
  *  of regression tests or particular tests.
 \*****************************************************************************/
 
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/cdev.h>
+#include <linux/fs.h>
+#include <linux/uaccess.h>
+#include <sys/types.h>
+#include <sys/debug.h>
 #include "splat-internal.h"
 
 static spl_class *splat_class;

diff --git a/module/splat/splat-generic.c b/module/splat/splat-generic.c
index f9c3c7ec549e8e7ba2acf452392d9d7c3ad02301..38df14d3b174709b139b93dc489bf004d1aca52b 100644 (file)
--- a/module/splat/splat-generic.c
+++ b/module/splat/splat-generic.c
@@ -24,6 +24,7 @@
  *  Solaris Porting LAyer Tests (SPLAT) Generic Tests.
 \*****************************************************************************/
 
+#include <sys/sunddi.h>
 #include "splat-internal.h"
 
 #define SPLAT_GENERIC_NAME             "generic"

diff --git a/module/splat/splat-internal.h b/module/splat/splat-internal.h
index 501e42c32d14c3fe06a368a1d3b77e3cb1dd0ad5..b15db65e2fe072e6721f250a2829f1227666dd6d 100644 (file)
--- a/module/splat/splat-internal.h
+++ b/module/splat/splat-internal.h
@@ -25,47 +25,6 @@
 #ifndef _SPLAT_INTERNAL_H
 #define _SPLAT_INTERNAL_H
 
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/elf.h>
-#include <linux/limits.h>
-#include <linux/version.h>
-#include <linux/vmalloc.h>
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/list.h>
-#include <linux/swap.h>
-#include <linux/delay.h>
-
-#include <asm/ioctls.h>
-#include <asm/uaccess.h>
-#include <stdarg.h>
-
-#include <sys/callb.h>
-#include <sys/condvar.h>
-#include <sys/cred.h>
-#include <sys/sysmacros.h>
-#include <sys/kmem.h>
-#include <sys/kstat.h>
-#include <sys/mutex.h>
-#include <sys/random.h>
-#include <sys/rwlock.h>
-#include <sys/taskq.h>
-#include <sys/thread.h>
-#include <sys/time.h>
-#include <sys/timer.h>
-#include <sys/types.h>
-#include <sys/kobj.h>
-#include <sys/atomic.h>
-#include <sys/list.h>
-#include <sys/sunddi.h>
-#include <sys/zmod.h>
-#include <linux/cdev.h>
-
 #include "spl-device.h"
 #include "spl-debug.h"
 #include "splat-ctl.h"

diff --git a/module/splat/splat-kmem.c b/module/splat/splat-kmem.c
index d0ad9a6664deabfc90b4020f538de9a2b47403d0..f1c4613fad07709e37bf8b4c86bbe315878878ba 100644 (file)
--- a/module/splat/splat-kmem.c
+++ b/module/splat/splat-kmem.c
@@ -24,6 +24,8 @@
  *  Solaris Porting LAyer Tests (SPLAT) Kmem Tests.
 \*****************************************************************************/
 
+#include <sys/kmem.h>
+#include <sys/thread.h>
 #include "splat-internal.h"
 
 #define SPLAT_KMEM_NAME                        "kmem"

diff --git a/module/splat/splat-kobj.c b/module/splat/splat-kobj.c
index f0720dbf551064791d8369a6b8e730331746ccbc..c76795418258d7e483f6d57b52471b658ac7cc43 100644 (file)
--- a/module/splat/splat-kobj.c
+++ b/module/splat/splat-kobj.c
@@ -24,6 +24,7 @@
  *  Solaris Porting LAyer Tests (SPLAT) Kobj Tests.
 \*****************************************************************************/
 
+#include <sys/kobj.h>
 #include "splat-internal.h"
 
 #define SPLAT_KOBJ_NAME                        "kobj"

diff --git a/module/splat/splat-linux.c b/module/splat/splat-linux.c
index 07126411ab7486c9e9ce99d61775cdf03aab5bb9..5303df4e034d9d8e13bd79e156d5489a23fe0be0 100644 (file)
--- a/module/splat/splat-linux.c
+++ b/module/splat/splat-linux.c
@@ -23,6 +23,7 @@
  *  Solaris Porting LAyer Tests (SPLAT) Kernel Compatibility Tests.
 \*****************************************************************************/
 
+#include <sys/kmem.h>
 #include "splat-internal.h"
 
 #define SPLAT_LINUX_NAME               "linux"

diff --git a/module/splat/splat-list.c b/module/splat/splat-list.c
index d517e7d226ab904d9cec0a3e2aba0679f6ec8f6c..34b570f393b830559d5139d5c3a2a6cb746b9470 100644 (file)
--- a/module/splat/splat-list.c
+++ b/module/splat/splat-list.c
@@ -24,6 +24,8 @@
  *  Solaris Porting LAyer Tests (SPLAT) List Tests.
 \*****************************************************************************/
 
+#include <sys/list.h>
+#include <sys/kmem.h>
 #include "splat-internal.h"
 
 #define SPLAT_LIST_NAME                        "list"

diff --git a/module/splat/splat-mutex.c b/module/splat/splat-mutex.c
index d134e49ced5944fc6f8e808e78b1882a2250ab69..9e6b24708e15b00711624d9b93e7acedff1df386 100644 (file)
--- a/module/splat/splat-mutex.c
+++ b/module/splat/splat-mutex.c
@@ -24,6 +24,8 @@
  *  Solaris Porting LAyer Tests (SPLAT) Mutex Tests.
 \*****************************************************************************/
 
+#include <sys/mutex.h>
+#include <sys/taskq.h>
 #include "splat-internal.h"
 
 #define SPLAT_MUTEX_NAME                "mutex"

diff --git a/module/splat/splat-random.c b/module/splat/splat-random.c
index 3ee580df785e1a5654db1ed1d94121304340d18d..63d96444f681572669e0aa5a7e87701197aa3698 100644 (file)
--- a/module/splat/splat-random.c
+++ b/module/splat/splat-random.c
@@ -24,6 +24,8 @@
  *  Solaris Porting LAyer Tests (SPLAT) Random Number Generator Tests.
 \*****************************************************************************/
 
+#include <sys/random.h>
+#include <sys/kmem.h>
 #include "splat-internal.h"
 
 #define SPLAT_KRNG_NAME                        "krng"

diff --git a/module/splat/splat-rwlock.c b/module/splat/splat-rwlock.c
index 2b9dee939e79c2f2cf1b30d8447c7f994d6c04b0..9e335d75658e7480c5ecbea8c7a8747dcecfa695 100644 (file)
--- a/module/splat/splat-rwlock.c
+++ b/module/splat/splat-rwlock.c
@@ -24,6 +24,9 @@
  *  Solaris Porting LAyer Tests (SPLAT) Read/Writer Lock Tests.
 \*****************************************************************************/
 
+#include <sys/rwlock.h>
+#include <sys/taskq.h>
+#include <sys/random.h>
 #include "splat-internal.h"
 
 #define SPLAT_RWLOCK_NAME              "rwlock"

diff --git a/module/splat/splat-taskq.c b/module/splat/splat-taskq.c
index 73142f9b65075cd407052a6c72ba69cbbba6b70b..38b563cc11f62ec6174b9870d209355cb4bd2099 100644 (file)
--- a/module/splat/splat-taskq.c
+++ b/module/splat/splat-taskq.c
@@ -24,6 +24,8 @@
  *  Solaris Porting LAyer Tests (SPLAT) Task Queue Tests.
 \*****************************************************************************/
 
+#include <sys/taskq.h>
+#include <sys/kmem.h>
 #include "splat-internal.h"
 
 #define SPLAT_TASKQ_NAME               "taskq"

diff --git a/module/splat/splat-thread.c b/module/splat/splat-thread.c
index 0f504836fe36a0866bc446ff914e4a48dca7ec07..c54cbcd8ac967d6ae441216e281e1ea3229b1b29 100644 (file)
--- a/module/splat/splat-thread.c
+++ b/module/splat/splat-thread.c
@@ -24,6 +24,8 @@
  *  Solaris Porting LAyer Tests (SPLAT) Thread Tests.
 \*****************************************************************************/
 
+#include <sys/thread.h>
+#include <sys/random.h>
 #include "splat-internal.h"
 
 #define SPLAT_THREAD_NAME              "thread"

diff --git a/module/splat/splat-time.c b/module/splat/splat-time.c
index 3b06b9ef2a0c4a93e399c4a2f4754dfd88bde74c..e6f8dc682d9d206bb850344090f96d97a620ce47 100644 (file)
--- a/module/splat/splat-time.c
+++ b/module/splat/splat-time.c
@@ -24,6 +24,7 @@
  *  Solaris Porting LAyer Tests (SPLAT) Time Tests.
 \*****************************************************************************/
 
+#include <sys/time.h>
 #include "splat-internal.h"
 
 #define SPLAT_TIME_NAME                        "time"

diff --git a/module/splat/splat-vnode.c b/module/splat/splat-vnode.c
index a57edf0def5ed005d1e4e1b638966f0ebfb4a918..7d1c75f17994d37555942d1198f0faa754de891a 100644 (file)
--- a/module/splat/splat-vnode.c
+++ b/module/splat/splat-vnode.c
@@ -24,8 +24,8 @@
  *  Solaris Porting LAyer Tests (SPLAT) Vnode Tests.
 \*****************************************************************************/
 
+#include <sys/vnode.h>
 #include "splat-internal.h"
-#include <linux/rcupdate.h>
 
 #define SPLAT_VNODE_NAME               "vnode"
 #define SPLAT_VNODE_DESC               "Kernel Vnode Tests"

diff --git a/module/splat/splat-zlib.c b/module/splat/splat-zlib.c
index 465d340917843e6b49a8ff29b7f483556e502424..852cf818fb35cad8def4923002d067e4e7d523bc 100644 (file)
--- a/module/splat/splat-zlib.c
+++ b/module/splat/splat-zlib.c
@@ -24,6 +24,9 @@
  *  Solaris Porting LAyer Tests (SPLAT) Zlib Compression Tests.
 \*****************************************************************************/
 
+#include <sys/zmod.h>
+#include <sys/random.h>
+#include <sys/kmem.h>
 #include "splat-internal.h"
 
 #define SPLAT_ZLIB_NAME                        "zlib"