From patchwork Thu Mar 1 16:28:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 130334 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp3008321edc; Thu, 1 Mar 2018 08:28:14 -0800 (PST) X-Google-Smtp-Source: AG47ELv/oQr9cS4pkjyiRyhhAcaz5xaiwZnIHqwZ47SXwwbCxcZgaMRXxHdNziQZr72nY8ua5rA4 X-Received: by 10.99.175.87 with SMTP id s23mr2007327pgo.328.1519921693982; Thu, 01 Mar 2018 08:28:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519921693; cv=none; d=google.com; s=arc-20160816; b=yJEdg0MFBW2AZkRu/IKRuq/VWVDVwMxDedv5rHWn0FBxs5Pz2iq2qwB+RxmsdzXPYe KmWco9NucznqxcJ2QxE+mFWGI+tip6viwfDJ+tNv3wthBiAf/Vh9+fHr8tWlsXA53HoS p9RtlGZWmIlgZTofj2SoqlZ1QmAcgxj1l66kXeoCmVhBHy8IQvVNTfnJLg36d7c1e40l L+/3lDHdfY6qyjxQ3ZElBsfCtkJuzn4P8cojeq3cUCsprdRZT20rGc5xemdEW0XHGX0c J/7sJiWH6LUZgxxQkSaT687cNclGkTwfrM9Zzpr+184RtE2qbsXeOuaz6sdKNxnxm531 2sLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=n8e+Lts+0s1EqAZQvu/IrH36xy3DzVLD8mZwXbkrjF0=; b=sdqQsCJ26PM2E9HSzNp7XiDPbdyk/GWwHYeIUjiUl5tvjHMasOWPhv4e8p0PZTSHuy 51q3TNirXg7v50QMAbWGIOQd/+zIVt0+i8/Q1h5YEC45fwr+p/xUOYTQva7BuLJF+EDs YFRtEkjNe3tC5f+mW9+Rgle6cuvhV2bPyZ2kRLvxeAhBughvR6Ac8KdwLbCnB6kvoUtR oYIEnkGHO7j6NtB8MMbGb/+DJSztk/zHng0Wxp/VJSc9Z11CZQSSoXnpRLEyx7sEDtaV UGlfUq8zB6sbFAGfcaK2bsXd9r+VMeptagiBsjsNC5bqvNJZlyUaLQM6Z1Q3Gq1HzGCn GBpw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u26si2664907pge.679.2018.03.01.08.28.13; Thu, 01 Mar 2018 08:28:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033167AbeCAQ2I (ORCPT + 28 others); Thu, 1 Mar 2018 11:28:08 -0500 Received: from mail-ot0-f195.google.com ([74.125.82.195]:46460 "EHLO mail-ot0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032997AbeCAQ2G (ORCPT ); Thu, 1 Mar 2018 11:28:06 -0500 Received: by mail-ot0-f195.google.com with SMTP id g97so6073790otg.13 for ; Thu, 01 Mar 2018 08:28:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=n8e+Lts+0s1EqAZQvu/IrH36xy3DzVLD8mZwXbkrjF0=; b=hJJkQtr3Nd3z9Jqr5ca574dgj/2qNv/JX4J4iQtmHOFxdlhuJ2PEm5hUDdgej06C5q nwQrF7Um3KAlgDa3bw4b7wkWujJsnEnqKn+BNryQhtOcYJ0pKvHbHpCn3Hl707RkCmu1 X3ZTI9R5EwyTavcWzAv36CZt+1wo5uGfAE/voKql+y5RfTWdFMUWOsxKjFw9+xPtDY9z R4BujG2QBcxU46WS7mcWbxHEd4eUzTL3O3U7gLa6HLN7Z6PCccpm49DXHjdRxQLhB3RZ K8Kox09FPS/CRb41YAbW7CkR611fSGdWDqJXs60GNWuhq97rlNuliXVlGDnzJ5siBE3r U0nQ== X-Gm-Message-State: AElRT7FMUFy3uzMX2FphEHVSjxAerZeEqtH18i/p8lF/dRs8FvFWsVzH iEfRUuf1nj9HYz9rE23xhA== X-Received: by 10.157.16.101 with SMTP id o34mr1737998oto.54.1519921685391; Thu, 01 Mar 2018 08:28:05 -0800 (PST) Received: from xps15.herring.priv (216-188-254-6.dyn.grandenetworks.net. [216.188.254.6]) by smtp.googlemail.com with ESMTPSA id w111sm2366426ota.41.2018.03.01.08.28.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Mar 2018 08:28:04 -0800 (PST) From: Rob Herring To: Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Ard Biesheuvel Subject: [PATCH] arm64/efi: Make strrchr() available to the EFI namespace Date: Thu, 1 Mar 2018 10:28:03 -0600 Message-Id: <20180301162803.5490-1-robh@kernel.org> X-Mailer: git-send-email 2.14.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org libfdt gained a new dependency on strrchr, so make it available to the EFI namespace before we update libfdt. Thanks to Ard for providing this fix. Cc: Catalin Marinas Cc: Will Deacon Acked-by: Ard Biesheuvel Signed-off-by: Rob Herring --- Please ack. This is a dependency on a dtc upstream sync. arch/arm64/kernel/image.h | 1 + arch/arm64/lib/strrchr.S | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- 2.14.1 Acked-by: Will Deacon diff --git a/arch/arm64/kernel/image.h b/arch/arm64/kernel/image.h index c7fcb232fe47..a820ed07fb80 100644 --- a/arch/arm64/kernel/image.h +++ b/arch/arm64/kernel/image.h @@ -103,6 +103,7 @@ __efistub_strlen = KALLSYMS_HIDE(__pi_strlen); __efistub_strnlen = KALLSYMS_HIDE(__pi_strnlen); __efistub_strcmp = KALLSYMS_HIDE(__pi_strcmp); __efistub_strncmp = KALLSYMS_HIDE(__pi_strncmp); +__efistub_strrchr = KALLSYMS_HIDE(__pi_strrchr); __efistub___flush_dcache_area = KALLSYMS_HIDE(__pi___flush_dcache_area); #ifdef CONFIG_KASAN diff --git a/arch/arm64/lib/strrchr.S b/arch/arm64/lib/strrchr.S index 61eabd9a289a..f8e2784d5752 100644 --- a/arch/arm64/lib/strrchr.S +++ b/arch/arm64/lib/strrchr.S @@ -40,4 +40,4 @@ ENTRY(strrchr) b 1b 2: mov x0, x3 ret -ENDPROC(strrchr) +ENDPIPROC(strrchr)