From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757306AbaCDNOc (ORCPT ); Tue, 4 Mar 2014 08:14:32 -0500 Received: from arkanian.console-pimps.org ([212.110.184.194]:58322 "EHLO arkanian.console-pimps.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757065AbaCDNOa (ORCPT ); Tue, 4 Mar 2014 08:14:30 -0500 From: Matt Fleming To: linux-efi@vger.kernel.org Cc: "H. Peter Anvin" , Borislav Petkov , Alan Cox , Matthew Garrett , linux-kernel@vger.kernel.org, Matt Fleming Subject: [PATCH 01/13] x86/boot: Cleanup header.S by removing some #ifdefs Date: Tue, 4 Mar 2014 13:14:09 +0000 Message-Id: <1393938861-16797-2-git-send-email-matt@console-pimps.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1393938861-16797-1-git-send-email-matt@console-pimps.org> References: <1393938861-16797-1-git-send-email-matt@console-pimps.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matt Fleming handover_offset is now filled out by build.c. Don't set a default value as it will be overwritten anyway. Acked-by: Borislav Petkov Signed-off-by: Matt Fleming --- arch/x86/boot/header.S | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S index ec3b8ba68096..d69d96653325 100644 --- a/arch/x86/boot/header.S +++ b/arch/x86/boot/header.S @@ -426,13 +426,7 @@ pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr #define INIT_SIZE VO_INIT_SIZE #endif init_size: .long INIT_SIZE # kernel initialization size -handover_offset: -#ifdef CONFIG_EFI_STUB - .long 0x30 # offset to the handover - # protocol entry point -#else - .long 0 -#endif +handover_offset: .long 0 # Filled in by build.c # End of setup header ##################################################### -- 1.8.5.3