diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 10:15:55 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 10:19:07 +0000 |
| commit | 3db4cafdfd05717dc939780134e53023a3c1f15f (patch) | |
| tree | a8273056b840931acf5ab781b22a8128c82733b8 /arch/x86/boot/compressed/head_64.S | |
| parent | b663a685831905066e3efcb4c173cd8b3f46228b (diff) | |
| download | talos-obmc-linux-3db4cafdfd05717dc939780134e53023a3c1f15f.tar.gz talos-obmc-linux-3db4cafdfd05717dc939780134e53023a3c1f15f.zip | |
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@intel.com>
Diffstat (limited to 'arch/x86/boot/compressed/head_64.S')
| -rw-r--r-- | arch/x86/boot/compressed/head_64.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S index 4f40cddd025d..57e58a5fa210 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 */ |
