commit edc39c9b4589a4ce9a69273b5a27a1459c3423d4
author Thomas Gleixner <tglx@linutronix.de> Tue Mar 20 10:56:18 2018 +0100
committer Thomas Gleixner <tglx@linutronix.de> Tue Mar 20 10:56:18 2018 +0100
tree e5850fe4a533579b0de12c02e48f7dcdd60e8e38
parent a06cc94f3f8dfab74fe7fac3a6e9f15d77566d00
parent 1b5f3ba415fe4cf8b8b39c8d104ed44cde330658

Merge branch 'linus' into x86/build to pick up dependencies

arch/x86/kernel/vmlinux.lds.S

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index b854ebf..795f3a8 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -102,7 +102,6 @@
 		_stext = .;
 		/* bootstrapping code */
 		HEAD_TEXT
-		. = ALIGN(8);
 		TEXT_TEXT
 		SCHED_TEXT
 		CPUIDLE_TEXT
@@ -200,7 +199,7 @@
 		. = __vvar_beginning_hack + PAGE_SIZE;
 	} :data
 
-       . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
+	. = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
 
 	/* Init code and data - will be freed after init */
 	. = ALIGN(PAGE_SIZE);
@@ -368,8 +367,8 @@
 	. = ALIGN(PAGE_SIZE);		/* keep VO_INIT_SIZE page aligned */
 	_end = .;
 
-        STABS_DEBUG
-        DWARF_DEBUG
+	STABS_DEBUG
+	DWARF_DEBUG
 
 	/* Sections to be discarded */
 	DISCARDS