summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2013-01-07 22:01:50 +0000
committerH. Peter Anvin <hpa@linux.intel.com>2013-01-27 20:19:37 -0800
commitf791620fa7517e1045742c475a7f005db9a634b8 (patch)
treeba3e074027f4a75065c8c3596c8b358263154438 /arch
parent70a479cbe80296d3113e65cc2f713a5101061daf (diff)
downloadlinux-f791620fa7517e1045742c475a7f005db9a634b8.tar.gz
linux-f791620fa7517e1045742c475a7f005db9a634b8.tar.bz2
linux-f791620fa7517e1045742c475a7f005db9a634b8.zip
x86, efi: Fix 32-bit EFI handover protocol entry point
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> Cc: <stable@kernel.org> 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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/boot/compressed/head_32.S2
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 aa4aaf1b2380..ccb2f4a5f7bd 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