From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS17314 8.43.84.0/22 X-Spam-Status: No, score=-4.2 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 46C9F1F5AE for ; Mon, 19 Jul 2021 16:49:27 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4DF06395C076 for ; Mon, 19 Jul 2021 16:49:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4DF06395C076 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626713366; bh=aCp/TIiM2wfCl2y2XKz4NPs1BtJ7UuNzOEYky/fHnbs=; 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=NmPm3LgXBha/id9woiCuokPiZbs7EYxnNGLYFA4c11Q0pMr4NxD8F9HDnZqvFQ12u QzokLuLkvTeYa/uWgEn11HTurh4NsY3EQkkHuK3CIOCi/Zy03dbTn7mZXggKwSUnck xVrb67eTuFJ115+ylAirQtwc3wiUxy3ZnFq8eu6M= Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by sourceware.org (Postfix) with ESMTPS id C981A395C000 for ; Mon, 19 Jul 2021 16:46:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C981A395C000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4093F611F2; Mon, 19 Jul 2021 16:46:20 +0000 (UTC) To: Catalin Marinas , Will Deacon Subject: [PATCH v5 4/4] elf: Remove has_interp property from arch_parse_elf_property() Date: Mon, 19 Jul 2021 17:45:36 +0100 Message-Id: <20210719164536.19143-5-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210719164536.19143-1-broonie@kernel.org> References: <20210719164536.19143-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2173; h=from:subject; bh=xgmswHaaDjiYO/29SYz5Q16qNtOA0Zo6sNUvA4c37C0=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBg9awvXgY1VJFTWSLZBweaBcwQZvplDUfcRo5H5J4P dD9gaUeJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYPWsLwAKCRAk1otyXVSH0L33B/ 9sTaTyQ0Kq64HnBsreB3L+Ff2x5ejY8EVL8ag/r9aMetT9RN0pFj6Ycj9gjcvqkeam7xFEMwUNJVNA E/zhf33RyxZl7mii2RDH/DLP9XvH6z2j49Kj20wjz3W4AAnM50rL1ikioqcqPdMtzJvyiSabdkk7vc rC8QVf5lOnWfe96Z5X2IY6UhIdWg3MiPIwJC591sc8i5UrHcWZirZ8myLd+J5aoSldsA4mb533x4v3 wrLPw8NBfD1CtXPvcWvebwFoap0HSdaf5QMOUdnY1iaDQB/Ru1gThJgjeiEnIQDNn5ExPHTFMIoNOl 1JnPwU1iWk+goBqL3MB0sXgk9lsXtj X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Content-Transfer-Encoding: 8bit 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: , From: Mark Brown via Libc-alpha 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+e=80x24.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 43b10fd04467..43f2ee69a7de 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -270,7 +270,7 @@ static inline int arm64_elf_bti_flag(bool is_interp) 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 4f3bea1a697c..e3beaf4345cd 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