summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-09-16 18:27:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-09-16 18:27:37 -0700
commit49a21e52a6baeea076301fd944268fd0d1f75be1 (patch)
treebd929f64b63373b3d02c7aaa8f2ec46f24c0dcf9 /arch
parentdf4c0b18f2a2798f1e3ae9dcf58c024bb33e4202 (diff)
parentd5a1baddf1585885868cbab55989401fb97118c6 (diff)
Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 boot code cleanup from Ingo Molnar: "Clean up the BUILD_BUG_ON() definition which can cause build warnings" * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/boot: Use common BUILD_BUG_ON
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/boot/boot.h2
-rw-r--r--arch/x86/boot/main.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
index 19eca14b49a0..ca866f1cca2e 100644
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -28,8 +28,6 @@
#include "cpuflags.h"
/* Useful macros */
-#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
-
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
extern struct setup_header hdr;
diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c
index 996df3d586f0..e3add857c2c9 100644
--- a/arch/x86/boot/main.c
+++ b/arch/x86/boot/main.c
@@ -10,6 +10,7 @@
/*
* Main module for the real-mode kernel code
*/
+#include <linux/build_bug.h>
#include "boot.h"
#include "string.h"