From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42587C11F67 for ; Mon, 12 Jul 2021 11:57:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2E69C610FA for ; Mon, 12 Jul 2021 11:57:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230457AbhGLMAJ (ORCPT ); Mon, 12 Jul 2021 08:00:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:33096 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234742AbhGLL75 (ORCPT ); Mon, 12 Jul 2021 07:59:57 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 83A5961004; Mon, 12 Jul 2021 11:57:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626091026; bh=HTz3krgKEK3sokcBu26fLZbDuEKvxHCHP7mYIquUumQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k2rbJ6DvNmbm7iUZuAMIT8AoxhwvhfMKQi+tcuaR1zlvFL7JB4VZ0TT9w2CKI4Eoj 0aAsgNk92HO2go81OBe8erEmltGY3CScKJSx7H/bokCy9aD29oFDZ7oJcfWf/2sSGT iCTiqOu9vesib/XVz62ZNfHaFXZID3kVMovsURBDWPPsBpsKBoY4JlJo4eOYZ4gvng xeWs2XaKBVuafUceb3rYxrJbVfRy/2og6eSzbUtbK+aqbg9oHuI1psE8QU6s6U3DA4 P2Z7KFDTDu21SmsV1q0yJn/Zy/IN/r8Rt7tqNSYOtKlYG1hyBSnIIp8qmYA+P8PgoB CgBhAv34a0+IQ== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Szabolcs Nagy , Jeremy Linton , Dave Martin , "H . J . Lu" , Yu-cheng Yu , linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, libc-alpha@sourceware.org, Mark Brown Subject: [PATCH v4 4/4] elf: Remove has_interp property from arch_parse_elf_property() Date: Mon, 12 Jul 2021 12:52:59 +0100 Message-Id: <20210712115259.29547-5-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712115259.29547-1-broonie@kernel.org> References: <20210712115259.29547-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2096; h=from:subject; bh=HTz3krgKEK3sokcBu26fLZbDuEKvxHCHP7mYIquUumQ=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBg7C0ZI7AUHkf3F2fqzYkpePJDKctDZoneaDiuq6uX SUkWpFqJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYOwtGQAKCRAk1otyXVSH0PbNB/ 4uADYxboRbRm4twF9ZWyE6U84qFWFNhkunDdhqmV5sHMOGIfBjDRARKSkfNLBXn4lS90YL0Q8z4SAw 47BmZThdClQ1rENhXe307rAe9GLkroAP71ra86cKnkfaMmDv4o840zURvHOLuy8iJXh9wEPIq015uH lOvPm6EWiLNfXNc69ah6pIavaZxT3GWhKcRR6ifFujYxlXIVAUwiWs51Z65SVMnAS7qZ1c4JDU8d+f 4f2c3kID3uohosUWvwiHCMjNb99oD7C9Tuw/nqamCs3CsoRCW2XARenCDij2oqJ+6rDvqe78w6NTGR cs0/tW7qaFCKSzSZm8eSwE7X1DYIWm X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arch@vger.kernel.org Since all current users of arch_parse_elf_property() are able to treat the interpreter and main executable orthogonaly the has_interp argument is now redundant so remove it. Signed-off-by: Mark Brown Tested-by: Jeremy Linton --- arch/arm64/include/asm/elf.h | 2 +- fs/binfmt_elf.c | 2 +- include/linux/elf.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 9f86dbce2680..a6e9032b951a 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -262,7 +262,7 @@ struct arch_elf_state { static inline int arch_parse_elf_property(u32 type, const void *data, size_t datasz, bool compat, - bool has_interp, bool is_interp, + bool is_interp, struct arch_elf_state *arch) { /* No known properties for AArch32 yet */ diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index ae8094d42480..f0b3c24215f6 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -753,7 +753,7 @@ static int parse_elf_property(const char *data, size_t *off, size_t datasz, ret = arch_parse_elf_property(pr->pr_type, data + o, pr->pr_datasz, ELF_COMPAT, - has_interp, is_interp, arch); + is_interp, arch); if (ret) return ret; diff --git a/include/linux/elf.h b/include/linux/elf.h index d8392531899d..cdb080d4b34a 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h @@ -88,14 +88,14 @@ struct arch_elf_state; #ifndef CONFIG_ARCH_USE_GNU_PROPERTY static inline int arch_parse_elf_property(u32 type, const void *data, size_t datasz, bool compat, - bool has_interp, bool is_interp, + bool is_interp, struct arch_elf_state *arch) { return 0; } #else extern int arch_parse_elf_property(u32 type, const void *data, size_t datasz, - bool compat, bool has_interp, bool is_interp, + bool compat, bool is_interp, struct arch_elf_state *arch); #endif -- 2.20.1