diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 18:18:50 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 18:18:50 +0000 |
| commit | 617b3c37da78cb89c63ed880b2405afc7490567b (patch) | |
| tree | 2b625590309c29af7f6f46db9221f3bd7587d834 /arch/x86/boot/compressed/head_32.S | |
| parent | 994448f1afa6689bafbebaf7412b23b541b41ef5 (diff) | |
| parent | 3db4cafdfd05717dc939780134e53023a3c1f15f (diff) | |
Merge branch 'mixed-mode' into efi-for-mingo
Diffstat (limited to 'arch/x86/boot/compressed/head_32.S')
| -rw-r--r-- | arch/x86/boot/compressed/head_32.S | 2 |
1 files changed, 2 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 |