Re: [PATCH v3 2/5] efi: provide a generic efi_config_init()

From: Matt Fleming
Date: Mon Sep 02 2013 - 05:29:17 EST


On Wed, 07 Aug, at 07:54:17PM, Leif Lindholm wrote:
> Common to (U)EFI support on all platforms is the global "efi" data
> structure, and the code that parses the System Table to locate
> addresses to populate that structure with.
>
> This patch adds both of these to the global EFI driver code.
>
> Signed-off-by: Leif Lindholm <leif.lindholm@xxxxxxxxxx>
> ---
> drivers/firmware/efi/efi.c | 108 ++++++++++++++++++++++++++++++++++++++++++++
> include/linux/efi.h | 7 +++
> 2 files changed, 115 insertions(+)

This patch actually breaks git bisection,

/home/build/git/efi/arch/x86/platform/efi/efi.c:581:19: error: conflicting types for âefi_config_initâ
In file included from /home/build/git/efi/arch/x86/platform/efi/efi.c:33:0:
/home/build/git/efi/include/linux/efi.h:596:12: note: previous declaration of âefi_config_initâ was here

I've merged patches 2,3 and 4 into the following single patch so that
the ability to bisect isn't lost. Does it look OK? It boots fine on my
test machines.

---