[PATCH 3.12 01/82] efi: fix 32bit kernel boot failed problem using efi

From: Jiri Slaby
Date: Mon Aug 24 2015 - 05:09:51 EST

From: Fupan Li <fupan.li@xxxxxxxxxxxxx>

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


3.12 commit 065487a10a22a960bc4e41facb011d10692ef470 ("x86/efi:
Correct EFI boot stub use of code32_start"), upstream commit
7e8213c1f3acc064aef37813a39f13cbfe7c3ce7 imported a bug, which will
cause 32bit kernel boot to fail using EFI method. It should use the
label's address instead of the value stored in the label to calculate
the address of code32_start.

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

diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
index b1bd969e26aa..36ddc61182af 100644
--- 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/