From: Matt Fleming Date: Fri, 23 Mar 2012 16:35:06 +0000 (-0700) Subject: x86, efi: Fix NumberOfRvaAndSizes field in PE32 header for EFI_STUB X-Git-Tag: android-x86-4.4-r1~3092^2~1 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e47bb0bda46bf50f81671db502d0c903e0a32604;p=android-x86%2Fkernel.git x86, efi: Fix NumberOfRvaAndSizes field in PE32 header for EFI_STUB We've actually got six data directories in the header, not one. Even though the firmware loader doesn't seem to mind, when we come to sign the kernel image the signing tool thinks that there is no Certificate Table data directory, even though we've allocated space for one. Signed-off-by: Matt Fleming Link: http://lkml.kernel.org/r/1332520506-6472-4-git-send-email-jordan.l.justen@intel.com Reviewed-by: Jordan Justen Signed-off-by: H. Peter Anvin --- diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S index 4ceb56e9a4ce..8bbea6aa40d9 100644 --- a/arch/x86/boot/header.S +++ b/arch/x86/boot/header.S @@ -189,7 +189,7 @@ extra_header_fields: .quad 0 # SizeOfHeapCommit #endif .long 0 # LoaderFlags - .long 0x1 # NumberOfRvaAndSizes + .long 0x6 # NumberOfRvaAndSizes .quad 0 # ExportTable .quad 0 # ImportTable