OK, I think this is the last of major cleanup and restructuring.

We've dropped all the linux- prefixes on the file in favor of spl-
which makes more sense.  And we've cleaned up some of the includes
so everybody should be including their own dependencies properly.
All a module which wants to use the spl support needs to do in
include spl.h and ensure it has access to Module.symvers.



git-svn-id: https://outreach.scidac.gov/svn/spl/trunk@16 7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c

7 files changed, 15 insertions, 30 deletions

diff --git a/modules/spl/Makefile.in b/modules/spl/Makefile.in
index 134d88227..09e934e4f 100644
--- a/modules/spl/Makefile.in
+++ b/modules/spl/Makefile.in
@@ -2,18 +2,18 @@
 
 MODULES := spl
 DISTFILES = Makefile.in \
-            linux-kmem.c linux-rwlock.c linux-taskq.c \
-            linux-thread.c linux-generic.c
+            spl-kmem.c spl-rwlock.c spl-taskq.c \
+            spl-thread.c spl-generic.c
 CPPFLAGS += @KERNELCPPFLAGS@
 
 # Solaris porting layer module
 obj-m := spl.o
 
-spl-objs += linux-kmem.o
-spl-objs += linux-thread.o
-spl-objs += linux-taskq.o
-spl-objs += linux-rwlock.o
-spl-objs += linux-generic.o
+spl-objs += spl-kmem.o
+spl-objs += spl-thread.o
+spl-objs += spl-taskq.o
+spl-objs += spl-rwlock.o
+spl-objs += spl-generic.o
 
 splmodule := spl.ko
 splmoduledir := @kmoduledir@/kernel/lib/
diff --git a/modules/spl/linux-generic.c b/modules/spl/spl-generic.c
index e139c351b..8a8435694 100644
--- a/modules/spl/linux-generic.c
+++ b/modules/spl/spl-generic.c
@@ -1,4 +1,4 @@
-#include "linux-generic.h"
+#include "spl-generic.h"
 #include "config.h"
 
 /*
diff --git a/modules/spl/linux-kmem.c b/modules/spl/spl-kmem.c
index 4dc7c01d8..9b8ba26a7 100644
--- a/modules/spl/linux-kmem.c
+++ b/modules/spl/spl-kmem.c
@@ -1,4 +1,4 @@
-#include "linux-kmem.h"
+#include "spl-kmem.h"
 
 /*
  * Memory allocation interfaces
diff --git a/modules/spl/linux-rwlock.c b/modules/spl/spl-rwlock.c
index 24775c414..cafdd9b1c 100644
--- a/modules/spl/linux-rwlock.c
+++ b/modules/spl/spl-rwlock.c
@@ -1,4 +1,4 @@
-#include <linux-rwlock.h>
+#include <spl-rwlock.h>
 
 int
 rw_lock_held(krwlock_t *rwlp)
diff --git a/modules/spl/linux-taskq.c b/modules/spl/spl-taskq.c
index ddcf57c3c..d20ae59bd 100644
--- a/modules/spl/linux-taskq.c
+++ b/modules/spl/spl-taskq.c
@@ -1,4 +1,4 @@
-#include <linux-taskq.h>
+#include <spl-taskq.h>
 
 /*
  * Task queue interface
diff --git a/modules/spl/linux-thread.c b/modules/spl/spl-thread.c
index 9785d50d3..b55f8c6af 100644
--- a/modules/spl/linux-thread.c
+++ b/modules/spl/spl-thread.c
@@ -1,4 +1,4 @@
-#include <linux-thread.h>
+#include <spl-thread.h>
 
 /*
  * Thread interfaces
@@ -90,8 +90,7 @@ __thread_create(caddr_t stk, size_t  stksize, void (*proc)(void *),
 
 	/* Solaris says this must never fail so we try forever */
 	while ((pid = kernel_thread(thread_generic_wrapper, (void *)&tp, 0)) < 0)
-		printk(KERN_ERR "linux-thread: Unable to create thread; "
-		       "pid = %ld\n", pid);
+		printk(KERN_ERR "Unable to create thread; pid = %ld\n", pid);
 
 	/* All signals are ignored due to sleeping TASK_UNINTERRUPTIBLE */
 	for (;;) {
diff --git a/modules/splat/splat-internal.h b/modules/splat/splat-internal.h
index 4e017e01e..a64b711fe 100644
--- a/modules/splat/splat-internal.h
+++ b/modules/splat/splat-internal.h
@@ -18,22 +18,8 @@
 #include <asm/uaccess.h>
 #include <stdarg.h>
 
-#include <linux-generic.h>
-#include <linux-types.h>
-#include <linux-kmem.h>
-#include <linux-mutex.h>
-#include <linux-condvar.h>
-#include <linux-random.h>
-#include <linux-thread.h>
-#include <linux-taskq.h>
-#include <linux-rwlock.h>
-#include <linux-timer.h>
-#include <linux-time.h>
-#include <linux-cred.h>
-#include <linux-kstat.h>
-#include <linux-callb.h>
-
-#include <splat-ctl.h>
+#include "spl.h"
+#include "splat-ctl.h"
 
 #define SPLAT_SUBSYSTEM_INIT(type)                                      \
 ({      splat_subsystem_t *_sub_;                                         \