Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49a21e52 authored Sep 16, 2019 by Linus Torvalds

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

parents df4c0b18 d5a1badd

arch/x86/boot/boot.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -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;

arch/x86/boot/main.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@
		/*
		* Main module for the real-mode kernel code
		*/
		#include <linux/build_bug.h>

		#include "boot.h"
		#include "string.h"