summaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
authorNed Bass <[email protected]>2014-11-14 10:21:53 -0800
committerBrian Behlendorf <[email protected]>2014-11-19 12:30:39 -0500
commitaaed7c408c0bd72c6f9437793a98542972f0a8fd (patch)
tree1880a1f7d7c72e7e1ec041bd31dca9e44bbe287c /module
parent7b2d78a046aa4695d434478a439a9438521d73af (diff)
Explicitly include SPL compat headers
Inclusion of SPL compatibility headers was moved out of the public header sys/types.h to avoid conflicts with external packages. Include a few compatiblity headers explicitly to cope with that change. Also, sort some linux-specific inclusions alphabetically. Signed-off-by: Ned Bass <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #2898
Diffstat (limited to 'module')
-rw-r--r--module/avl/avl.c1
-rw-r--r--module/nvpair/nvpair.c1
-rw-r--r--module/unicode/u8_textprep.c1
-rw-r--r--module/zcommon/zfs_prop.c1
-rw-r--r--module/zfs/arc.c1
-rw-r--r--module/zfs/zfs_ioctl.c1
-rw-r--r--module/zpios/pios.c1
7 files changed, 7 insertions, 0 deletions
diff --git a/module/avl/avl.c b/module/avl/avl.c
index b598cc918..5c2b722e6 100644
--- a/module/avl/avl.c
+++ b/module/avl/avl.c
@@ -1030,6 +1030,7 @@ done:
}
#if defined(_KERNEL) && defined(HAVE_SPL)
+#include <linux/module_compat.h>
static int avl_init(void) { return 0; }
static int avl_fini(void) { return 0; }
diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c
index f5c31663a..9fd486bca 100644
--- a/module/nvpair/nvpair.c
+++ b/module/nvpair/nvpair.c
@@ -3293,6 +3293,7 @@ nvs_xdr(nvstream_t *nvs, nvlist_t *nvl, char *buf, size_t *buflen)
}
#if defined(_KERNEL) && defined(HAVE_SPL)
+#include <linux/module_compat.h>
static int nvpair_init(void) { return 0; }
static int nvpair_fini(void) { return 0; }
diff --git a/module/unicode/u8_textprep.c b/module/unicode/u8_textprep.c
index 60e586d25..f5ab77951 100644
--- a/module/unicode/u8_textprep.c
+++ b/module/unicode/u8_textprep.c
@@ -2133,6 +2133,7 @@ u8_textprep_str(char *inarray, size_t *inlen, char *outarray, size_t *outlen,
}
#if defined(_KERNEL) && defined(HAVE_SPL)
+#include <linux/module_compat.h>
static int unicode_init(void) { return 0; }
static int unicode_fini(void) { return 0; }
diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c
index e60c4f7d4..18b5f951e 100644
--- a/module/zcommon/zfs_prop.c
+++ b/module/zcommon/zfs_prop.c
@@ -678,6 +678,7 @@ zfs_prop_align_right(zfs_prop_t prop)
#endif
#if defined(_KERNEL) && defined(HAVE_SPL)
+#include <linux/module_compat.h>
static int zcommon_init(void) { return 0; }
static int zcommon_fini(void) { return 0; }
diff --git a/module/zfs/arc.c b/module/zfs/arc.c
index fd593a13e..5b90d9a9f 100644
--- a/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@ -140,6 +140,7 @@
#include <vm/anon.h>
#include <sys/fs/swapnode.h>
#include <sys/zpl.h>
+#include <linux/mm_compat.h>
#endif
#include <sys/callb.h>
#include <sys/kstat.h>
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index 9396d6caa..5fb407900 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -186,6 +186,7 @@
#include <sys/zfeature.h>
#include <linux/miscdevice.h>
+#include <linux/module_compat.h>
#include "zfs_namecheck.h"
#include "zfs_prop.h"
diff --git a/module/zpios/pios.c b/module/zpios/pios.c
index 860edea7b..fb15046be 100644
--- a/module/zpios/pios.c
+++ b/module/zpios/pios.c
@@ -36,6 +36,7 @@
#include <sys/txg.h>
#include <sys/dsl_destroy.h>
#include <linux/miscdevice.h>
+#include <linux/module_compat.h>
#include "zpios-internal.h"