diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2013-01-07 22:01:50 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-03 18:27:06 -0600 |
| commit | e8298a286761e2e9b3aa1b088b7e8aef0da45c6c (patch) | |
| tree | b0f325108e465dfbd3851688f2c66193434570c5 | |
| parent | 23c70dc831ea93fa73b29167cd7ed94147b61386 (diff) | |
x86, efi: Fix 32-bit EFI handover protocol entry point
commit f791620fa7517e1045742c475a7f005db9a634b8 upstream.
If the bootloader calls the EFI handover entry point as a standard function
call, then it'll have a return address on the stack. We need to pop that
before calling efi_main(), or the arguments will all be out of position on
the stack.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Link: http://lkml.kernel.org/r/1358513837.2397.247.camel@shinybook.infradead.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 aa4aaf1b238..ccb2f4a5f7b 100644 --- a/arch/x86/boot/compressed/head_32.S +++ b/arch/x86/boot/compressed/head_32.S @@ -50,8 +50,10 @@ ENTRY(startup_32) pushl %eax pushl %esi pushl %ecx + sub $0x4, %esp .org 0x30,0x90 + add $0x4, %esp call efi_main cmpl $0, %eax movl %eax, %esi |