Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (97cddfc3) · Commits · 戴 / test

arch/x86/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -2417,7 +2417,7 @@ config CMDLINE

		config CMDLINE_OVERRIDE
		bool "Built-in command line overrides boot loader arguments"
		depends on CMDLINE_BOOL
		depends on CMDLINE_BOOL && CMDLINE != ""
		---help---
		Set this option to 'Y' to have the kernel ignore the boot loader
		command line, and use ONLY the built-in command line.

+7 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,13 @@ SECTIONS
		(.gnu.linkonce.b.)
		} :text

		/*
		* Discard .note.gnu.property sections which are unused and have
		* different alignment requirement from vDSO note sections.
		*/
		/DISCARD/ : {
		*(.note.gnu.property)
		}
		.note : { (.note.) } :text :note

		.eh_frame_hdr : { *(.eh_frame_hdr) } :text :eh_frame_hdr

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#define LOAD_OFFSET __START_KERNEL_map
		#endif

		#define RUNTIME_DISCARD_EXIT
		#define EMITS_PT_NOTE
		#define RO_EXCEPTION_TABLE_ALIGN 16

+9 −2

Original line number	Diff line number	Diff line
		@@ -894,10 +894,17 @@
		* section definitions so that such archs put those in earlier section
		* definitions.
		*/
		#ifdef RUNTIME_DISCARD_EXIT
		#define EXIT_DISCARDS
		#else
		#define EXIT_DISCARDS \
		EXIT_TEXT \
		EXIT_DATA
		#endif

		#define DISCARDS \
		/DISCARD/ : { \
		EXIT_TEXT \
		EXIT_DATA \
		EXIT_DISCARDS \
		EXIT_CALL \
		*(.discard) \
		(.discard.) \