* [PATCH tip/efi-kexec] x86: setup.c build fix
@ 2014-01-03 3:56 ` Dave Young
0 siblings, 0 replies; 8+ messages in thread
From: Dave Young @ 2014-01-03 3:56 UTC (permalink / raw)
To: matt, hpa, mingo, linux-kernel, x86, kexec
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 <dyoung@redhat.com>
---
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 */
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH tip/efi-kexec] x86: setup.c build fix
@ 2014-01-03 3:56 ` Dave Young
0 siblings, 0 replies; 8+ messages in thread
From: Dave Young @ 2014-01-03 3:56 UTC (permalink / raw)
To: matt, hpa, mingo, linux-kernel, x86, kexec
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 <dyoung@redhat.com>
---
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 */
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH tip/efi-kexec] x86: setup.c build fix
2014-01-03 3:56 ` Dave Young
@ 2014-01-03 14:40 ` Matt Fleming
-1 siblings, 0 replies; 8+ messages in thread
From: Matt Fleming @ 2014-01-03 14:40 UTC (permalink / raw)
To: Dave Young; +Cc: linux-kernel, x86, kexec, mingo, hpa
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 <dyoung@redhat.com>
> ---
> 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
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH tip/efi-kexec] x86: setup.c build fix
@ 2014-01-03 14:40 ` Matt Fleming
0 siblings, 0 replies; 8+ messages in thread
From: Matt Fleming @ 2014-01-03 14:40 UTC (permalink / raw)
To: Dave Young; +Cc: hpa, mingo, linux-kernel, x86, kexec
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 <dyoung@redhat.com>
> ---
> 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH tip/efi-kexec] x86: setup.c build fix
2014-01-03 14:40 ` Matt Fleming
@ 2014-01-03 22:24 ` H. Peter Anvin
-1 siblings, 0 replies; 8+ messages in thread
From: H. Peter Anvin @ 2014-01-03 22:24 UTC (permalink / raw)
To: Matt Fleming, Dave Young; +Cc: x86, kexec, mingo, linux-kernel
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 <dyoung@redhat.com>
>> ---
>> 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
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH tip/efi-kexec] x86: setup.c build fix
@ 2014-01-03 22:24 ` H. Peter Anvin
0 siblings, 0 replies; 8+ messages in thread
From: H. Peter Anvin @ 2014-01-03 22:24 UTC (permalink / raw)
To: Matt Fleming, Dave Young; +Cc: mingo, linux-kernel, x86, kexec
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 <dyoung@redhat.com>
>> ---
>> 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH tip/efi-kexec] x86: setup.c build fix
2014-01-03 22:24 ` H. Peter Anvin
@ 2014-01-03 22:27 ` Matt Fleming
-1 siblings, 0 replies; 8+ messages in thread
From: Matt Fleming @ 2014-01-03 22:27 UTC (permalink / raw)
To: H. Peter Anvin; +Cc: kexec, x86, Dave Young, mingo, linux-kernel
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
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH tip/efi-kexec] x86: setup.c build fix
@ 2014-01-03 22:27 ` Matt Fleming
0 siblings, 0 replies; 8+ messages in thread
From: Matt Fleming @ 2014-01-03 22:27 UTC (permalink / raw)
To: H. Peter Anvin; +Cc: Dave Young, mingo, linux-kernel, x86, kexec
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
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-01-03 22:27 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-03 3:56 [PATCH tip/efi-kexec] x86: setup.c build fix Dave Young
2014-01-03 3:56 ` Dave Young
2014-01-03 14:40 ` Matt Fleming
2014-01-03 14:40 ` Matt Fleming
2014-01-03 22:24 ` H. Peter Anvin
2014-01-03 22:24 ` H. Peter Anvin
2014-01-03 22:27 ` Matt Fleming
2014-01-03 22:27 ` Matt Fleming
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.