aboutsummaryrefslogtreecommitdiffstats
path: root/include/spl
diff options
context:
space:
mode:
authorTomohiro Kusumi <[email protected]>2019-05-08 01:55:40 +0900
committerBrian Behlendorf <[email protected]>2019-05-07 09:55:40 -0700
commit75346937de39f059722eedd29468ac9b86bea67c (patch)
treec9744011e7bb4aada15e70f9200378d6ce7a7af2 /include/spl
parentc6eaa14620906267a491dd6bd6097c68abb8f8da (diff)
Linux 5.1 compat: Drop ULLONG_MAX and LLONG_MAX definitions
Linux kernel commit 54d50897d544c874562253e2a8f70dfcad22afe8 "linux/kernel.h: split *_MAX and *_MIN macros into <linux/limits.h>" which first appeared in 5.1 has moved several macros from <linux/kernel.h> to <linux/limits.h>. This broke compilation due to header inclusion order against the local header include/spl/sys/types.h which also defines ULLONG_MAX and LLONG_MAX if undefined. It looks like local ULLONG_MAX and LLONG_MAX were never needed (or after spl integration ?) as <linux/kernel.h> has had the same definitions since an upstream commit 111ebb6e6f7bd7de6d722c5848e95621f43700d9 in 2.6.18, so drop them. -- linux/include/linux/limits.h:17: error: "LLONG_MAX" redefined [-Werror] #define LLONG_MAX ((long long)(~0ULL >> 1)) zfs/include/spl/sys/types.h:35: note: this is the location of the previous definition #define LLONG_MAX ((long long)(~0ULL>>1)) Reviewed-by: Richard Laager <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tomohiro Kusumi <[email protected]> Closes #8714
Diffstat (limited to 'include/spl')
-rw-r--r--include/spl/sys/types.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/include/spl/sys/types.h b/include/spl/sys/types.h
index 483e36751..719a44646 100644
--- a/include/spl/sys/types.h
+++ b/include/spl/sys/types.h
@@ -27,14 +27,6 @@
#include <linux/types.h>
-#ifndef ULLONG_MAX
-#define ULLONG_MAX (~0ULL)
-#endif
-
-#ifndef LLONG_MAX
-#define LLONG_MAX ((long long)(~0ULL>>1))
-#endif
-
typedef enum {
B_FALSE = 0,
B_TRUE = 1