Skip to contentSkip to conversation

x86: setup.c build fix

PATCH In review Dave Young 3 participants 4 messages Jan 3, 2014

Subsystems (4)
x86 EFI Live update kexec handover (KHO)
lore
Share & tools
lore

Dave Young

author
#0 lore raw

PATCH 1/1 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':

Quoted 1 line
Quoted 1 line

(.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(-)
arch/x86/include/asm/efi.h +2 -3
Index: 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 */

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#1 lore raw
Quoted 11 lines · Dave Young

In case without CONFIG_EFI, there will be below build error:
arch/x86/built-in.o: In function `setup_arch':

Quoted 1 line
Quoted 1 line

(.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.

Signature · 1 line
Matt Fleming, Intel Open Source Technology Center
reviewer
#2 lore raw
Quoted 8 lines · Matt Fleming
Quoted 7 lines · Dave Young

In case without CONFIG_EFI, there will be below build error:
arch/x86/built-in.o: In function `setup_arch':

Quoted 1 line
Quoted 1 line

(.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.

Quoted 7 lines
Quoted 4 lines
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

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#3 lore raw
Quoted 2 lines · H. Peter Anvin

Something I should be pulling?

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

Signature · 1 line
Matt Fleming, Intel Open Source Technology Center