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 (Arm)" X-Patchwork-Id: 10251911 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5323360211 for ; Thu, 1 Mar 2018 16:28:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F8032853E for ; Thu, 1 Mar 2018 16:28:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 346662856F; Thu, 1 Mar 2018 16:28:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B77652853E for ; Thu, 1 Mar 2018 16:28:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=Em+heK1zCti/QqUUXpxRppFGXtLOTG2Baw4TBUYU9aA=; b=Zcl l/ELSXlQFtlQAeV8RheVR1nLcbYX3IXrKSp/vl4pPdh1r1YxgaJvYdtNS+r9z7mJtZ/NHIObPd5JX e9G+3bq69WfG9TWRKyTB7ciAPyKsFP41cRmkSGxks8Xp00fxYvOHASKn6zNfD1oDGqYAjT1EJw17p IXeHT7qzqe7+br59zAZFEna/FIquqDDeJjbCbru6AwxtdwHcvhU9u6gx/DD54IuSs9dvaLgPx2/gK POCQ2s7ZbCT+bLCl/GdxJsTLU0SDQR+EaKYl2GKX6dqxni9HDho7oOKS4YkiapA5hu9tZ4JuaOc+N eFo+A8Avqsp0wDQsa3bjxScQLw79ZVg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1erR4Q-0005CD-Qr; Thu, 01 Mar 2018 16:28:38 +0000 Received: from mail-ot0-f193.google.com ([74.125.82.193]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1erR44-0004sZ-JO for linux-arm-kernel@lists.infradead.org; Thu, 01 Mar 2018 16:28:27 +0000 Received: by mail-ot0-f193.google.com with SMTP id y11so6123127otg.0 for ; Thu, 01 Mar 2018 08:28:06 -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=H0IFT1uoS0kxbY+TAEUB6KX96rs5It70yAsw6qa1JyKhZU2GkLNoNer2c3R08ppanu 27z1KswB0qpgLS2I1TI2ClBcLDNDI63SPNxUeZ8YQxFhD2DVKNUeckbCa/ThnUoN6RD1 JkqpEs2u5rCj5fG2vCBj3nGuFV27IZdgGzAhgAfqVtUmHaerz8sNrfVPAn7JvRReacrx JUN3mf3GL+44BOZSj9XQoP3HRfmw+VX1jmCimRuTefrtsOJI2f1vJjoaiyOniMXAVYgM kFNYyiP5P112qHFDPJCD3YSPQGNkeDyZQwKSSf3z9CLzgK5enMoPWHJDhnK0EOubshqA 0Nmw== X-Gm-Message-State: AElRT7HJkK5EWh65xO/QnwoN4S2ihTaHr+fuBgF0pnRUjlK3x2o8su+J iXySzvhSfdXMNmq6Scgkcg== X-Google-Smtp-Source: AG47ELsmSnlGLM5k8sPHl9bA5giSpxWx6/ax5B5PSTmXi53XCtk4H2Qp+FQu21XjQaRem/cBGwR2dQ== 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180301_082817_341108_A3249186 X-CRM114-Status: GOOD ( 11.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Ard Biesheuvel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Will Deacon --- 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(-) 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)