diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 22:18:50 +0400 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 22:18:50 +0400 |
| commit | 617b3c37da78cb89c63ed880b2405afc7490567b (patch) | |
| tree | 2b625590309c29af7f6f46db9221f3bd7587d834 /arch/x86/boot/compressed | |
| parent | 994448f1afa6689bafbebaf7412b23b541b41ef5 (diff) | |
| parent | 3db4cafdfd05717dc939780134e53023a3c1f15f (diff) | |
| download | linux-617b3c37da78cb89c63ed880b2405afc7490567b.tar.xz | |
Merge branch 'mixed-mode' into efi-for-mingo
Diffstat (limited to 'arch/x86/boot/compressed')
| -rw-r--r-- | arch/x86/boot/compressed/head_32.S | 2 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/head_64.S | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S index cccc05f0681c..de9d4200d305 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 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 */ |