From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933010AbbHIKYk (ORCPT ); Sun, 9 Aug 2015 06:24:40 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36058 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932977AbbHIKYi (ORCPT ); Sun, 9 Aug 2015 06:24:38 -0400 Date: Sun, 9 Aug 2015 03:24:00 -0700 From: tip-bot for Matt Fleming Message-ID: Cc: hpa@zytor.com, linn@hp.com, tglx@linutronix.de, peterz@infradead.org, torvalds@linux-foundation.org, mbrown@fensystems.co.uk, linux-kernel@vger.kernel.org, mingo@kernel.org, matt.fleming@intel.com Reply-To: linn@hp.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, matt.fleming@intel.com, torvalds@linux-foundation.org, peterz@infradead.org, mbrown@fensystems.co.uk, hpa@zytor.com In-Reply-To: <1438936621-5215-3-git-send-email-matt@codeblueprint.co.uk> References: <1438936621-5215-3-git-send-email-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:core/efi] Revert "x86/efi: Request desired alignment via the PE/COFF headers" Git-Commit-ID: fa5c35011a8d5f3d0c597a6336107eafd1b6046c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: fa5c35011a8d5f3d0c597a6336107eafd1b6046c Gitweb: http://git.kernel.org/tip/fa5c35011a8d5f3d0c597a6336107eafd1b6046c Author: Matt Fleming AuthorDate: Fri, 7 Aug 2015 09:36:56 +0100 Committer: Ingo Molnar CommitDate: Sat, 8 Aug 2015 10:37:39 +0200 Revert "x86/efi: Request desired alignment via the PE/COFF headers" This reverts commit: aeffc4928ea2 ("x86/efi: Request desired alignment via the PE/COFF headers") Linn reports that Signtool complains that kernels built with CONFIG_EFI_STUB=y are violating the PE/COFF specification because the 'SizeOfImage' field is not a multiple of 'SectionAlignment'. This violation was introduced as an optimisation to skip having the kernel relocate itself during boot and instead have the firmware place it at a correctly aligned address. No one else has complained and I'm not aware of any firmware implementations that refuse to boot with commit aeffc4928ea2, but it's a real bug, so revert the offending commit. Reported-by: Linn Crosetto Signed-off-by: Matt Fleming Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Michael Brown Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1438936621-5215-3-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- arch/x86/boot/header.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S index 16ef025..7a6d43a 100644 --- a/arch/x86/boot/header.S +++ b/arch/x86/boot/header.S @@ -154,7 +154,7 @@ extra_header_fields: #else .quad 0 # ImageBase #endif - .long CONFIG_PHYSICAL_ALIGN # SectionAlignment + .long 0x20 # SectionAlignment .long 0x20 # FileAlignment .word 0 # MajorOperatingSystemVersion .word 0 # MinorOperatingSystemVersion