diff options
author | Matt Fleming <matt.fleming@intel.com> | 2013-08-01 08:33:26 -0400 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-04 16:23:34 -0500 |
commit | 86134a1b39fd056a7b6778608a5882f0ea1bc705 (patch) | |
tree | 41d902976ee0d306b8221fa759e1be174f659e9c /arch/x86/boot | |
parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff) |
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>
Diffstat (limited to 'arch/x86/boot')
-rw-r--r-- | arch/x86/boot/header.S | 8 |
1 files changed, 1 insertions, 7 deletions
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 | |||
426 | #define INIT_SIZE VO_INIT_SIZE | 426 | #define INIT_SIZE VO_INIT_SIZE |
427 | #endif | 427 | #endif |
428 | init_size: .long INIT_SIZE # kernel initialization size | 428 | init_size: .long INIT_SIZE # kernel initialization size |
429 | handover_offset: | 429 | handover_offset: .long 0 # Filled in by build.c |
430 | #ifdef CONFIG_EFI_STUB | ||
431 | .long 0x30 # offset to the handover | ||
432 | # protocol entry point | ||
433 | #else | ||
434 | .long 0 | ||
435 | #endif | ||
436 | 430 | ||
437 | # End of setup header ##################################################### | 431 | # End of setup header ##################################################### |
438 | 432 | ||