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/spl/spl-generic.c | |
| 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/spl/spl-generic.c')
| -rw-r--r-- | module/spl/spl-generic.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 |