| From f791620fa7517e1045742c475a7f005db9a634b8 Mon Sep 17 00:00:00 2001 |
| From: David Woodhouse <David.Woodhouse@intel.com> |
| Date: Mon, 7 Jan 2013 22:01:50 +0000 |
| Subject: x86, efi: Fix 32-bit EFI handover protocol entry point |
| |
| From: David Woodhouse <David.Woodhouse@intel.com> |
| |
| 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> |
| |
| --- |
| arch/x86/boot/compressed/head_32.S | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- 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 |
