3.10-stable patches

added patches:
	efi-fix-32bit-kernel-boot-failed-problem-using-efi.patch

diff --git a/queue-3.10/efi-fix-32bit-kernel-boot-failed-problem-using-efi.patch b/queue-3.10/efi-fix-32bit-kernel-boot-failed-problem-using-efi.patch
new file mode 100644 (file)
index 0000000..9827bd0
--- /dev/null
+++ b/queue-3.10/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: <fupan.li@windriver.com>
+Date: Tue, 4 Aug 2015 09:51:21 +0800
+Subject: efi: fix 32bit kernel boot failed problem using efi
+To: <gregkh@linuxfoundation.org>, <matt@codeblueprint.co.uk>
+Cc: <jslaby@suse.cz>, <linux-efi@vger.kernel.org>, <stable@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <fupanli@gmail.com>, <ben@decadent.org.uk>
+Message-ID: <1438653081-25746-1-git-send-email-fupan.li@windriver.com>
+
+From: Fupan Li <fupan.li@windriver.com>
+
+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 <fupan.li@windriver.com>
+Reviewed-by: Matt Fleming <matt.fleming@intel.com>
+---
+ 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.10/series b/queue-3.10/series
index 3576885fb80560915785c94c71a3f129e656b0bb..d8f5b623fcfefbdbb40237573b00010402ab2d2e 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -23,3 +23,4 @@ rds-rds_ib_device.refcount-overflow.patch
 vhost-actually-track-log-eventfd-file.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