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

------------------

From: Fupan Li <fupan...@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...@windriver.com>
Reviewed-by: Matt Fleming <matt.flem...@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


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

Reply via email to