summaryrefslogtreecommitdiff
path: root/tools/include/linux/kernel.h
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2020-04-20 18:34:20 +0300
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>2020-04-20 18:34:20 +0300
commitf7ea285b6266822bd63af2a3695f03e3357fd74f (patch)
treead5d6f3bab25094c81a072fb56fcac2f50ed91ed /tools/include/linux/kernel.h
parent97e130f63757ede9abc4a9ee42b5fcad466a8e97 (diff)
parentc7582ff7ed388b803d083166514a4c8acd4ef57d (diff)
Merge branch 'ib-pdx86-properties'
Merge branch 'ib-pdx86-properties' of git://git.infradead.org/linux-platform-drivers-x86.git to avoid conflicts in PDx86. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'tools/include/linux/kernel.h')
-rw-r--r--tools/include/linux/kernel.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/include/linux/kernel.h b/tools/include/linux/kernel.h
index cba226948a0c..a7e54a08fb54 100644
--- a/tools/include/linux/kernel.h
+++ b/tools/include/linux/kernel.h
@@ -5,6 +5,7 @@
#include <stdarg.h>
#include <stddef.h>
#include <assert.h>
+#include <linux/build_bug.h>
#include <linux/compiler.h>
#include <endian.h>
#include <byteswap.h>
@@ -35,9 +36,6 @@
(type *)((char *)__mptr - offsetof(type, member)); })
#endif
-#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
-#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
-
#ifndef max
#define max(x, y) ({ \
typeof(x) _max1 = (x); \