From nobody Mon Dec 15 21:25:28 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45FEEC4332F for ; Thu, 9 Nov 2023 10:20:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232654AbjKIKU4 (ORCPT ); Thu, 9 Nov 2023 05:20:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230055AbjKIKUz (ORCPT ); Thu, 9 Nov 2023 05:20:55 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 89C8A19A3 for ; Thu, 9 Nov 2023 02:20:52 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CDDF312FC; Thu, 9 Nov 2023 02:21:36 -0800 (PST) Received: from e123572-lin.arm.com (e123572-lin.cambridge.arm.com [10.1.194.65]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4FC793F703; Thu, 9 Nov 2023 02:20:51 -0800 (PST) From: Kevin Brodsky To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Catalin Marinas , Arnd Bergmann , Kees Cook , Ard Biesheuvel , Kevin Brodsky Subject: [PATCH] arm64/syscall: Remove duplicate declaration Date: Thu, 9 Nov 2023 10:19:58 +0000 Message-ID: <20231109101958.225593-1-kevin.brodsky@arm.com> X-Mailer: git-send-email 2.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Commit 6ac19f96515e ("arm64: avoid prototype warnings for syscalls") added missing declarations to various syscall wrapper macros. It however proved a little too zealous in __SYSCALL_DEFINEx(), as a declaration for __arm64_sys##name was already present. This likely wouldn't have happened if declarations were consistently located, ideally just before the corresponding definition. Accordingly, this patch removes the old declaration line in __SYSCALL_DEFINEx(), and moves any other declaration that does not directly precede the corresponding definition. Signed-off-by: Kevin Brodsky --- arch/arm64/include/asm/syscall_wrapper.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/syscall_wrapper.h b/arch/arm64/include/= asm/syscall_wrapper.h index 17f687510c48..0d1ec3280f89 100644 --- a/arch/arm64/include/asm/syscall_wrapper.h +++ b/arch/arm64/include/asm/syscall_wrapper.h @@ -18,10 +18,10 @@ #ifdef CONFIG_COMPAT =20 #define COMPAT_SYSCALL_DEFINEx(x, name, ...) \ - asmlinkage long __arm64_compat_sys##name(const struct pt_regs *regs); \ ALLOW_ERROR_INJECTION(__arm64_compat_sys##name, ERRNO); \ static long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \ static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));= \ + asmlinkage long __arm64_compat_sys##name(const struct pt_regs *regs); \ asmlinkage long __arm64_compat_sys##name(const struct pt_regs *regs) \ { \ return __se_compat_sys##name(SC_ARM64_REGS_TO_ARGS(x,__VA_ARGS__)); \ @@ -50,7 +50,6 @@ #endif /* CONFIG_COMPAT */ =20 #define __SYSCALL_DEFINEx(x, name, ...) \ - asmlinkage long __arm64_sys##name(const struct pt_regs *regs); \ ALLOW_ERROR_INJECTION(__arm64_sys##name, ERRNO); \ static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \ static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \ @@ -70,8 +69,8 @@ =20 #define SYSCALL_DEFINE0(sname) \ SYSCALL_METADATA(_##sname, 0); \ - asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused); \ ALLOW_ERROR_INJECTION(__arm64_sys_##sname, ERRNO); \ + asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused); \ asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused) =20 #define COND_SYSCALL(name) \ --=20 2.42.1