Skip to content

Commit

Permalink
x86/boot: Cleanup header.S by removing some #ifdefs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matt Fleming committed Mar 4, 2014
1 parent 6d0abec commit 86134a1
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions arch/x86/boot/header.S
Original file line number Diff line number Diff line change
Expand Up @@ -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 #####################################################

Expand Down

0 comments on commit 86134a1

Please sign in to comment.