Commit-ID: 3db4cafdfd05717dc939780134e53023a3c1f15f
Gitweb: http://git.kernel.org/tip/3db4cafdfd05717dc939780134e53023a3c1f15f
Author: Matt Fleming <matt.fleming@xxxxxxxxx>
AuthorDate: Wed, 5 Mar 2014 10:15:55 +0000
Committer: Matt Fleming <matt.fleming@xxxxxxxxx>
CommitDate: Wed, 5 Mar 2014 10:19:07 +0000
x86/boot: Fix non-EFI build
The kbuild test robot reported the following errors, introduced with
commit 54b52d872680 ("x86/efi: Build our own EFI services pointer
table"),
arch/x86/boot/compressed/head_32.o: In function `efi32_config':
>> (.data+0x58): undefined reference to `efi_call_phys'
arch/x86/boot/compressed/head_64.o: In function `efi64_config':
>> (.data+0x90): undefined reference to `efi_call6'
Wrap the efi*_config structures in #ifdef CONFIG_EFI_STUB so that we
don't make references to EFI functions if they're not compiled in.
Signed-off-by: Matt Fleming <matt.fleming@xxxxxxxxx>
---
arch/x86/boot/compressed/head_32.S | 2 ++
arch/x86/boot/compressed/head_64.S | 3 +++
2 files changed, 5 insertions(+)
diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
index cccc05f..de9d420 100644
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
@@ -229,12 +229,14 @@ relocated:
xorl %ebx, %ebx
jmp *%eax
+#ifdef CONFIG_EFI_STUB
.data
efi32_config:
.fill 11,8,0
.long efi_call_phys
.long 0
.byte 0
+#endif
/*
* Stack and heap for uncompression
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index 4f40cdd..57e58a5 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -440,6 +440,7 @@ gdt:
.quad 0x0000000000000000 /* TS continued */
gdt_end:
+#ifdef CONFIG_EFI_STUB
efi_config:
.quad 0
@@ -456,6 +457,8 @@ efi64_config:
.fill 11,8,0
.quad efi_call6
.byte 1
+#endif /* CONFIG_EFI_STUB */
+
/*
* Stack and heap for uncompression
*/
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|