From 47b10da58ea24d4b55188cbf0f4bff4eab6b49b4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 8 Aug 2015 15:05:21 -0700 Subject: [PATCH] 3.14-stable patches added patches: efi-fix-32bit-kernel-boot-failed-problem-using-efi.patch --- ...kernel-boot-failed-problem-using-efi.patch | 34 +++++++++++++++++++ queue-3.14/series | 1 + 2 files changed, 35 insertions(+) create mode 100644 queue-3.14/efi-fix-32bit-kernel-boot-failed-problem-using-efi.patch diff --git a/queue-3.14/efi-fix-32bit-kernel-boot-failed-problem-using-efi.patch b/queue-3.14/efi-fix-32bit-kernel-boot-failed-problem-using-efi.patch new file mode 100644 index 00000000000..9827bd00cda --- /dev/null +++ b/queue-3.14/efi-fix-32bit-kernel-boot-failed-problem-using-efi.patch @@ -0,0 +1,34 @@ +From fupan.li@windriver.com Sat Aug 8 15:03:02 2015 +From: +Date: Tue, 4 Aug 2015 09:51:21 +0800 +Subject: efi: fix 32bit kernel boot failed problem using efi +To: , +Cc: , , , , , +Message-ID: <1438653081-25746-1-git-send-email-fupan.li@windriver.com> + +From: Fupan Li + +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 +code32_start. + +Signed-off-by: Fupan Li +Reviewed-by: Matt Fleming +--- + 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 + reloc: + popl %ecx +- subl reloc, %ecx ++ subl $reloc, %ecx + movl %ecx, BP_code32_start(%eax) + + sub $0x4, %esp diff --git a/queue-3.14/series b/queue-3.14/series index 681758b69d4..5702e09592f 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -26,3 +26,4 @@ vhost-actually-track-log-eventfd-file.patch avr32-handle-null-as-a-valid-clock-object.patch iscsi-target-fix-use-after-free-during-tpg-session-shutdown.patch iscsi-target-fix-iser-explicit-logout-tx-kthread-leak.patch +efi-fix-32bit-kernel-boot-failed-problem-using-efi.patch -- 2.47.2