[PATCH 3.10 26/26] efi: fix 32bit kernel boot failed problem using efi

From: Greg Kroah-Hartman
Date: Sat Aug 08 2015 - 18:47:58 EST

3.10-stable review patch. If anyone has any objections, please let me know.


From: Fupan Li <fupan.li@xxxxxxxxxxxxx>

Commit 35d5134b7d5a
("x86/efi: Correct EFI boot stub use of code32_start")
imported a bug, which will cause 32bit kernel boot failed
using efi method. It should use the label's address instead
of the value stored in the label to caculate the address of

Signed-off-by: Fupan Li <fupan.li@xxxxxxxxxxxxx>
Reviewed-by: Matt Fleming <matt.fleming@xxxxxxxxx>
arch/x86/boot/compressed/head_32.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
@@ -54,7 +54,7 @@ ENTRY(efi_pe_entry)
call reloc
popl %ecx
- subl reloc, %ecx
+ subl $reloc, %ecx
movl %ecx, BP_code32_start(%eax)

sub $0x4, %esp

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/