2014-01-03 03:57:13

by Dave Young

Subject: [PATCH tip/efi-kexec] x86: setup.c build fix

In case without CONFIG_EFI, there will be below build error:
arch/x86/built-in.o: In function `setup_arch':
>> (.init.text+0x9dc): undefined reference to `parse_efi_setup'

Thus fix it by adding blank inline function in asm/efi.h
Also remove an unused declaration for variable efi_data_len.

Signed-off-by: Dave Young <[email protected]>
---
arch/x86/include/asm/efi.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

Index: tip/arch/x86/include/asm/efi.h
===================================================================
--- tip.orig/arch/x86/include/asm/efi.h
+++ tip/arch/x86/include/asm/efi.h
@@ -142,8 +142,6 @@ struct efi_setup_data {
};

extern u64 efi_setup;
-extern u32 efi_data_len;
-extern void parse_efi_setup(u64 phys_addr, u32 data_len);

#ifdef CONFIG_EFI

@@ -153,7 +151,7 @@ static inline bool efi_is_native(void)
}

extern struct console early_efi_console;
-
+extern void parse_efi_setup(u64 phys_addr, u32 data_len);
#else
/*
* IF EFI is not configured, have the EFI calls return -ENOSYS.
@@ -165,6 +163,7 @@ extern struct console early_efi_console;
#define efi_call4(_f, _a1, _a2, _a3, _a4) (-ENOSYS)
#define efi_call5(_f, _a1, _a2, _a3, _a4, _a5) (-ENOSYS)
#define efi_call6(_f, _a1, _a2, _a3, _a4, _a5, _a6) (-ENOSYS)
+static inline void parse_efi_setup(u64 phys_addr, u32 data_len) {}
#endif /* CONFIG_EFI */

#endif /* _ASM_X86_EFI_H */

2014-01-03 14:40:50

by Matt Fleming

Subject: Re: [PATCH tip/efi-kexec] x86: setup.c build fix

On Fri, 03 Jan, at 11:56:49AM, Dave Young wrote:
> In case without CONFIG_EFI, there will be below build error:
> arch/x86/built-in.o: In function `setup_arch':
> >> (.init.text+0x9dc): undefined reference to `parse_efi_setup'
>
> Thus fix it by adding blank inline function in asm/efi.h
> Also remove an unused declaration for variable efi_data_len.
>
> Signed-off-by: Dave Young <[email protected]>
> ---
> arch/x86/include/asm/efi.h | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)

Thanks Dave. I picked up both patches.

--
Matt Fleming, Intel Open Source Technology Center

2014-01-03 22:25:12

by H. Peter Anvin

Subject: Re: [PATCH tip/efi-kexec] x86: setup.c build fix

On 01/03/2014 06:40 AM, Matt Fleming wrote:
> On Fri, 03 Jan, at 11:56:49AM, Dave Young wrote:
>> In case without CONFIG_EFI, there will be below build error:
>> arch/x86/built-in.o: In function `setup_arch':
>>>> (.init.text+0x9dc): undefined reference to `parse_efi_setup'
>>
>> Thus fix it by adding blank inline function in asm/efi.h
>> Also remove an unused declaration for variable efi_data_len.
>>
>> Signed-off-by: Dave Young <[email protected]>
>> ---
>> arch/x86/include/asm/efi.h | 5 ++---
>> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> Thanks Dave. I picked up both patches.
>

Something I should be pulling?

-hpa

2014-01-03 22:27:28

by Matt Fleming

Subject: Re: [PATCH tip/efi-kexec] x86: setup.c build fix

On Fri, 03 Jan, at 02:24:28PM, H. Peter Anvin wrote:
>
> Something I should be pulling?

Yep, I'll be sending the pull request momentarily.

--
Matt Fleming, Intel Open Source Technology Center