Cleanly split Linux proc.h (fs) from conflicting Solaris proc.h (process)

[zfs] / module / spl / spl-generic.c

diff --git a/module/spl/spl-generic.c b/module/spl/spl-generic.c
index 9916051de0fc28c31446d063c5e7a04ee2fa86cc..d5c1523e1a2d45d7cbb47e502bc1dd21e3e044b6 100644 (file)
--- 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