diff options
| author | Brian Behlendorf <[email protected]> | 2010-06-11 14:37:46 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2010-06-11 15:57:25 -0700 |
| commit | ae4c36adce9228eb444c1d5e19f00e83303dbeee (patch) | |
| tree | ae66b580d1d87436790ade78bd895bcc254459ce /module | |
| parent | 71b1242e677d1e44d9273f9bbe1206a2184eabf8 (diff) | |
Cleanly split Linux proc.h (fs) from conflicting Solaris proc.h (process)
Under linux the proc.h header is for the /proc filesystem, and under
Solaris the proc/h header if for processes. This patch correctly
moves the Linux proc functionality in a linux/proc_compat.h header
and leaves the sys/proc.h for use by Solaris. Minor updates were
required to all the call sites where it was included of course.
Diffstat (limited to 'module')
| -rw-r--r-- | module/spl/spl-debug.c | 2 | ||||
| -rw-r--r-- | module/spl/spl-generic.c | 3 | ||||
| -rw-r--r-- | module/spl/spl-kstat.c | 1 | ||||
| -rw-r--r-- | module/spl/spl-proc.c | 6 | ||||
| -rw-r--r-- | module/spl/spl-thread.c | 2 |
5 files changed, 10 insertions, 4 deletions
diff --git a/module/spl/spl-debug.c b/module/spl/spl-debug.c index 8ee6c5dfb..6a1086241 100644 --- a/module/spl/spl-debug.c +++ b/module/spl/spl-debug.c @@ -34,8 +34,8 @@ #include <linux/hardirq.h> #include <linux/interrupt.h> #include <linux/spinlock.h> +#include <linux/proc_compat.h> #include <sys/sysmacros.h> -#include <sys/proc.h> #include <sys/debug.h> #include <spl-ctl.h> diff --git a/module/spl/spl-generic.c b/module/spl/spl-generic.c index 9916051de..d5c1523e1 100644 --- a/module/spl/spl-generic.c +++ b/module/spl/spl-generic.c @@ -38,6 +38,7 @@ #include <sys/utsname.h> #include <sys/file.h> #include <linux/kmod.h> +#include <linux/proc_compat.h> #ifdef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM @@ -53,7 +54,7 @@ EXPORT_SYMBOL(spl_hostid); char hw_serial[HW_HOSTID_LEN] = "<none>"; EXPORT_SYMBOL(hw_serial); -int p0 = 0; +proc_t p0 = { 0 }; EXPORT_SYMBOL(p0); #ifndef HAVE_KALLSYMS_LOOKUP_NAME diff --git a/module/spl/spl-kstat.c b/module/spl/spl-kstat.c index 2b45549d6..433f3e5b0 100644 --- a/module/spl/spl-kstat.c +++ b/module/spl/spl-kstat.c @@ -25,6 +25,7 @@ \*****************************************************************************/ #include <sys/kstat.h> +#include <linux/seq_file.h> static spinlock_t kstat_lock; static struct list_head kstat_list; diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c index 3bc8b40cf..277a92a7a 100644 --- a/module/spl/spl-proc.c +++ b/module/spl/spl-proc.c @@ -24,7 +24,11 @@ * Solaris Porting Layer (SPL) Proc Implementation. \*****************************************************************************/ -#include <sys/proc.h> +#include <sys/systeminfo.h> +#include <sys/kstat.h> +#include <linux/kmod.h> +#include <linux/seq_file.h> +#include <linux/proc_compat.h> #ifdef DEBUG_SUBSYSTEM #undef DEBUG_SUBSYSTEM diff --git a/module/spl/spl-thread.c b/module/spl/spl-thread.c index de959119e..1345890ed 100644 --- a/module/spl/spl-thread.c +++ b/module/spl/spl-thread.c @@ -83,7 +83,7 @@ EXPORT_SYMBOL(__thread_exit); * style callers likely never check for... since it can't fail. */ kthread_t * __thread_create(caddr_t stk, size_t stksize, thread_func_t func, - const char *name, void *args, size_t len, int *pp, + const char *name, void *args, size_t len, proc_t *pp, int state, pri_t pri) { thread_priv_t *tp; |