From patchwork Mon Jun 22 04:12:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 50130 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 81C50214B9 for ; Mon, 22 Jun 2015 04:14:33 +0000 (UTC) Received: by lbcui10 with SMTP id ui10sf725201lbc.0 for ; Sun, 21 Jun 2015 21:14:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=MLlVGdIOPWCiMUcx7qHlTxsFXgWo5NJl/n+TV5DP3kk=; b=XhfPAuE496An95aD+K5EvChsle33cwqBELyAjUQKVUn0EtG6a02k3ynf19R1tJLtup V4ok/t0crUwDtZhaql2L/HRIdzv5ZxNYQM9mp03didBhdOFx10YXypPEHhZvSJuXpx8d vXDv7MaFGNCfiiS+UZncNAlzvhoh7uF8kocxuV0W6BmNiZARL/ValD3OuwbkO3jPRuPl m473BuiO82RQp6DHEllC1kejrMmlHHUFRxQpIWZ5k2MLJWaZX/eqR7szMYKXiWfkL+Y/ UhdSGDbDwq4bp6wKkjOX58X1ro9S3jD4lPRhrXlXzErg9UlsabTBh5+QfeaokELN0tuM hGuA== X-Gm-Message-State: ALoCoQkcgIoPHBwN6LILc9BjyuLC+z8LTU8Jam4avdjDT7r7GhIpbkoWubOezCfbtLzew4Xp9YBM X-Received: by 10.112.203.168 with SMTP id kr8mr26222943lbc.10.1434946472499; Sun, 21 Jun 2015 21:14:32 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.104 with SMTP id i8ls33536laa.50.gmail; Sun, 21 Jun 2015 21:14:32 -0700 (PDT) X-Received: by 10.152.22.99 with SMTP id c3mr28916876laf.32.1434946472379; Sun, 21 Jun 2015 21:14:32 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id l7si15493040lae.121.2015.06.21.21.14.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Jun 2015 21:14:32 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbbti3 with SMTP id ti3so101077075lbb.1 for ; Sun, 21 Jun 2015 21:14:32 -0700 (PDT) X-Received: by 10.152.87.33 with SMTP id u1mr28708179laz.35.1434946472163; Sun, 21 Jun 2015 21:14:32 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp2117886lbb; Sun, 21 Jun 2015 21:14:31 -0700 (PDT) X-Received: by 10.69.26.4 with SMTP id iu4mr53735086pbd.140.1434946445526; Sun, 21 Jun 2015 21:14:05 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id lw8si27666587pdb.54.2015.06.21.21.14.04; Sun, 21 Jun 2015 21:14:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752536AbbFVEOD (ORCPT + 2 others); Mon, 22 Jun 2015 00:14:03 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:41001 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751337AbbFVEN5 (ORCPT ); Mon, 22 Jun 2015 00:13:57 -0400 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t5M4Dlue007593 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 22 Jun 2015 04:13:48 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t5M4Dl9e005779 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Mon, 22 Jun 2015 04:13:47 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id t5M4DlTI024671; Mon, 22 Jun 2015 04:13:47 GMT Received: from lappy.hsd1.nh.comcast.net (/10.154.108.26) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sun, 21 Jun 2015 21:13:47 -0700 From: Sasha Levin To: stable@vger.kernel.org, stable-commits@vger.kernel.org Cc: Steve Capper , Will Deacon , Sasha Levin Subject: [added to the 3.18 stable tree] arm64: Adjust EFI libstub object include logic Date: Mon, 22 Jun 2015 00:12:38 -0400 Message-Id: <1434946411-9021-12-git-send-email-sasha.levin@oracle.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1434946411-9021-1-git-send-email-sasha.levin@oracle.com> References: <1434946411-9021-1-git-send-email-sasha.levin@oracle.com> X-Source-IP: userv0021.oracle.com [156.151.31.71] Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Steve Capper This patch has been added to the 3.18 stable tree. If you have any objections, please let us know. =============== [ Upstream commit ad08fd494bf00c03ae372e0bbd9cefa37bf608d6 ] Commit f4f75ad5 ("efi: efistub: Convert into static library") introduced a static library for EFI stub, libstub. The EFI libstub directory is referenced by the kernel build system via a obj subdirectory rule in: drivers/firmware/efi/Makefile Unfortunately, arm64 also references the EFI libstub via: libs-$(CONFIG_EFI_STUB) += drivers/firmware/efi/libstub/ If we're unlucky, the kernel build system can enter libstub via two simultaneous threads resulting in build failures such as: fixdep: error opening depfile: drivers/firmware/efi/libstub/.efi-stub-helper.o.d: No such file or directory scripts/Makefile.build:257: recipe for target 'drivers/firmware/efi/libstub/efi-stub-helper.o' failed make[1]: *** [drivers/firmware/efi/libstub/efi-stub-helper.o] Error 2 Makefile:939: recipe for target 'drivers/firmware/efi/libstub' failed make: *** [drivers/firmware/efi/libstub] Error 2 make: *** Waiting for unfinished jobs.... This patch adjusts the arm64 Makefile to reference the compiled library explicitly (as is currently done in x86), rather than the directory. Fixes: f4f75ad5 efi: efistub: Convert into static library Signed-off-by: Steve Capper Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 50365a1..419854c 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -48,7 +48,7 @@ core-$(CONFIG_KVM) += arch/arm64/kvm/ core-$(CONFIG_XEN) += arch/arm64/xen/ core-$(CONFIG_CRYPTO) += arch/arm64/crypto/ libs-y := arch/arm64/lib/ $(libs-y) -libs-$(CONFIG_EFI_STUB) += drivers/firmware/efi/libstub/ +core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a # Default target when executing plain make KBUILD_IMAGE := Image.gz