From: Matt Fleming <matt@console-pimps.org>
To: linux-efi@vger.kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>, Borislav Petkov <bp@alien8.de>,
Alan Cox <alan@lxorguk.ukuu.org.uk>,
Matthew Garrett <mjg59@srcf.ucam.org>,
linux-kernel@vger.kernel.org,
Matt Fleming <matt.fleming@intel.com>
Subject: [PATCH 01/13] x86/boot: Cleanup header.S by removing some #ifdefs
Date: Tue, 4 Mar 2014 13:14:09 +0000 [thread overview]
Message-ID: <1393938861-16797-2-git-send-email-matt@console-pimps.org> (raw)
In-Reply-To: <1393938861-16797-1-git-send-email-matt@console-pimps.org>
From: Matt Fleming <matt.fleming@intel.com>
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>
---
| 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
--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 #####################################################
--
1.8.5.3
next prev parent reply other threads:[~2014-03-04 13:14 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-04 13:14 [PATCH v2 00/13] EFI mixed mode Matt Fleming
2014-03-04 13:14 ` Matt Fleming [this message]
2014-03-04 13:14 ` [PATCH 02/13] x86, tools: Consolidate #ifdef code Matt Fleming
2014-03-04 13:14 ` [PATCH 03/13] x86/mm/pageattr: Always dump the right page table in an oops Matt Fleming
2014-03-04 13:14 ` [PATCH 04/13] x86/efi: Delete dead code when checking for non-native Matt Fleming
2014-03-04 13:14 ` [PATCH 05/13] efi: Add separate 32-bit/64-bit definitions Matt Fleming
[not found] ` <1393938861-16797-1-git-send-email-matt-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2014-03-04 13:14 ` [PATCH v2 06/13] x86/efi: Build our own EFI services pointer table Matt Fleming
[not found] ` <1393938861-16797-7-git-send-email-matt-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2014-03-22 0:52 ` Roy Franz
[not found] ` <CAFECyb8QKy-r_2a7Dy8j9Nv=8pGUKJbnOzLoJhd6shvf0PmBCg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-03-22 11:05 ` Matt Fleming
[not found] ` <20140322110515.GF2815-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2014-03-22 20:16 ` Roy Franz
[not found] ` <CAFECyb8VnNzwUEOY-jkO60_9yKw_sbp_K5UQZU5EECcNjAs+sg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-03-25 22:47 ` Roy Franz
[not found] ` <CAFECyb-+uBtmPQZzsJBugROo-AjAwXEvX48-1pPKwiSJwfWGUg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-03-26 9:10 ` Matt Fleming
2014-03-25 22:40 ` [PATCH] Add efi_early_call() macro Roy Franz
[not found] ` <1395787231-14298-1-git-send-email-roy.franz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-03-26 8:59 ` Matt Fleming
2014-03-26 17:40 ` Roy Franz
2014-03-04 13:14 ` [PATCH 07/13] x86/efi: Add early thunk code to go from 64-bit to 32-bit Matt Fleming
2014-03-06 21:27 ` [PATCH v2 00/13] EFI mixed mode David Rientjes
2014-03-06 21:40 ` Matt Fleming
[not found] ` <20140306214014.GA8942-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2014-03-07 10:11 ` David Rientjes
2014-03-04 13:14 ` [PATCH 08/13] x86/efi: Split the boot stub into 32/64 code paths Matt Fleming
2014-03-04 13:14 ` [PATCH 09/13] x86/efi: Firmware agnostic handover entry points Matt Fleming
2014-03-04 13:14 ` [PATCH 10/13] x86/efi: Add mixed runtime services support Matt Fleming
2014-03-04 13:14 ` [PATCH 11/13] x86/efi: Wire up CONFIG_EFI_MIXED Matt Fleming
2014-03-04 13:14 ` [PATCH 12/13] x86/boot: Don't overwrite cr4 when enabling PAE Matt Fleming
2014-03-04 13:14 ` [PATCH 13/13] x86/efi: Re-disable interrupts after calling firmware services Matt Fleming
-- strict thread matches above, loose matches on Subject: below --
2014-02-27 19:50 [PATCH 00/13] EFI mixed mode Matt Fleming
[not found] ` <1393530660-12692-1-git-send-email-matt-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2014-02-27 19:50 ` [PATCH 01/13] x86/boot: Cleanup header.S by removing some #ifdefs Matt Fleming
2014-02-27 19:46 [PATCH 00/13] EFI mixed mode Matt Fleming
[not found] ` <1393530404-12479-1-git-send-email-matt-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2014-02-27 19:46 ` [PATCH 01/13] x86/boot: Cleanup header.S by removing some #ifdefs Matt Fleming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1393938861-16797-2-git-send-email-matt@console-pimps.org \
--to=matt@console-pimps.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt.fleming@intel.com \
--cc=mjg59@srcf.ucam.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).