summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2015-01-21 14:09:17 +0900
committerSascha Hauer <s.hauer@pengutronix.de>2015-01-21 14:58:07 +0100
commit2ce9068d853ed59b5d731e1d6b3945b9fb0f078e (patch)
tree22b8f890e5fa973af6c707bf516f30dd76c39741 /include
parent13a1b45058d2203c51c0ec2d5ccf24696d6bd960 (diff)
downloadbarebox-2ce9068d853ed59b5d731e1d6b3945b9fb0f078e.tar.gz
barebox-2ce9068d853ed59b5d731e1d6b3945b9fb0f078e.tar.xz
linux/kernel.h: move *_MAX, *_MIN macros
Linux defines *_MAX, *_MIN macros in include/linux/kernel.h. Let's follow this way to slim down the common.h. This change should have no impact because include/common.h already includes <linux/kernel.h>. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/common.h13
-rw-r--r--include/linux/kernel.h13
2 files changed, 13 insertions, 13 deletions
diff --git a/include/common.h b/include/common.h
index fca9798bbb..f3f5c0fcac 100644
--- a/include/common.h
+++ b/include/common.h
@@ -225,19 +225,6 @@ static inline char *shell_expand(char *str)
const typeof( ((type *)0)->member ) *__mptr = (ptr); \
(type *)( (char *)__mptr - offsetof(type,member) );})
-#define USHORT_MAX ((u16)(~0U))
-#define SHORT_MAX ((s16)(USHORT_MAX>>1))
-#define SHORT_MIN (-SHORT_MAX - 1)
-#define INT_MAX ((int)(~0U>>1))
-#define INT_MIN (-INT_MAX - 1)
-#define UINT_MAX (~0U)
-#define LONG_MAX ((long)(~0UL>>1))
-#define LONG_MIN (-LONG_MAX - 1)
-#define ULONG_MAX (~0UL)
-#define LLONG_MAX ((long long)(~0ULL>>1))
-#define LLONG_MIN (-LLONG_MAX - 1)
-#define ULLONG_MAX (~0ULL)
-
#define PAGE_SIZE 4096
#define PAGE_SHIFT 12
#define PAGE_ALIGN(s) (((s) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1))
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 98f12e1b93..33cf62e52d 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -4,6 +4,19 @@
#include <linux/compiler.h>
#include <linux/barebox-wrapper.h>
+#define USHORT_MAX ((u16)(~0U))
+#define SHORT_MAX ((s16)(USHORT_MAX>>1))
+#define SHORT_MIN (-SHORT_MAX - 1)
+#define INT_MAX ((int)(~0U>>1))
+#define INT_MIN (-INT_MAX - 1)
+#define UINT_MAX (~0U)
+#define LONG_MAX ((long)(~0UL>>1))
+#define LONG_MIN (-LONG_MAX - 1)
+#define ULONG_MAX (~0UL)
+#define LLONG_MAX ((long long)(~0ULL>>1))
+#define LLONG_MIN (-LLONG_MAX - 1)
+#define ULLONG_MAX (~0ULL)
+
/*
* This looks more complex than it should be. But we need to
* get the type for the ~ right in round_down (it needs to be