diff options
| author | Ned Bass <[email protected]> | 2014-11-14 10:21:53 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-11-19 12:30:39 -0500 |
| commit | aaed7c408c0bd72c6f9437793a98542972f0a8fd (patch) | |
| tree | 1880a1f7d7c72e7e1ec041bd31dca9e44bbe287c /module/zfs | |
| parent | 7b2d78a046aa4695d434478a439a9438521d73af (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/zfs')
| -rw-r--r-- | module/zfs/arc.c | 1 | ||||
| -rw-r--r-- | module/zfs/zfs_ioctl.c | 1 |
2 files changed, 2 insertions, 0 deletions
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" |