From patchwork Mon Jul 12 11:52:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 44317 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F1BB43888837 for ; Mon, 12 Jul 2021 12:00:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F1BB43888837 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626091225; bh=se/zJlYKTeZhddsmasTaHmmX84hjvUIwZs31QnKAo5o=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=wDW8u9lk+8fGtQkHlOi/dxjLXNdsTgXW1sj8MtiiwlBHRiApPL22h4ttJqB3cIU8m ZKWCbahiHrNj4XlRHr+mhyVQFF5qxwBtF3/CGse2x/xdlKo13hpUjIbpgwtzaJSNyt BNcHLMMD/1zao3D14Maf8/DkbXhedJs+2nTpcGao= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by sourceware.org (Postfix) with ESMTPS id 118733888035 for ; Mon, 12 Jul 2021 11:57:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 118733888035 Received: by mail.kernel.org (Postfix) with ESMTPSA id 83A5961004; Mon, 12 Jul 2021 11:57:05 +0000 (UTC) To: Catalin Marinas , Will Deacon 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 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Mark Brown via Libc-alpha From: Mark Brown Reply-To: Mark Brown Cc: linux-arch@vger.kernel.org, Yu-cheng Yu , libc-alpha@sourceware.org, Szabolcs Nagy , Jeremy Linton , Mark Brown , Dave Martin , linux-arm-kernel@lists.infradead.org Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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 Reviewed-by: Dave Martin --- 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