From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033260AbeCARI0 (ORCPT ); Thu, 1 Mar 2018 12:08:26 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:42224 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032742AbeCARIY (ORCPT ); Thu, 1 Mar 2018 12:08:24 -0500 Date: Thu, 1 Mar 2018 17:08:26 +0000 From: Will Deacon To: Rob Herring Cc: Catalin Marinas , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Ard Biesheuvel Subject: Re: [PATCH] arm64/efi: Make strrchr() available to the EFI namespace Message-ID: <20180301170826.GA2678@arm.com> References: <20180301162803.5490-1-robh@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180301162803.5490-1-robh@kernel.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 01, 2018 at 10:28:03AM -0600, Rob Herring wrote: > 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. Acked-by: Will Deacon As an aside, I noticed that this __efistub prefixing is also being applied to mapping symbols, so we get crazy stuff like __efistub_$x. I didn't get round to working out whether that's going to be problematic, but maybe it's all fine... Will > > arch/arm64/kernel/image.h | 1 + > arch/arm64/lib/strrchr.S | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > 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) > -- > 2.14.1 >