From: Matt Fleming <matt.fleming@intel.com>
Date: Thu, 1 Aug 2013 12:33:26 +0000 (+0100)
Subject: x86/boot: Cleanup header.S by removing some #ifdefs
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=86134a1b39fd056a7b6778608a5882f0ea1bc705;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

x86/boot: Cleanup header.S by removing some #ifdefs

handover_offset is now filled out by build.c. Don't set a default value
as it will be overwritten anyway.

Acked-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
---

diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index ec3b8ba68096..d69d96653325 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -426,13 +426,7 @@ pref_address:		.quad LOAD_PHYSICAL_ADDR	# preferred load addr
 #define INIT_SIZE VO_INIT_SIZE
 #endif
 init_size:		.long INIT_SIZE		# kernel initialization size
-handover_offset:
-#ifdef CONFIG_EFI_STUB
-  			.long 0x30		# offset to the handover
-						# protocol entry point
-#else
-			.long 0
-#endif
+handover_offset:	.long 0			# Filled in by build.c
 
 # End of setup header #####################################################