From patchwork Thu Nov 9 14:11:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brodsky X-Patchwork-Id: 163405 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp459512vqs; Thu, 9 Nov 2023 06:12:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IFpvXwwByUCq9d8QiRIAY0NG8DMycgAaOtU8Y6AoYkOD5ujqiKbwLMU3xWt/zM98Kvp4qMP X-Received: by 2002:a17:90b:3146:b0:27f:fa7a:a7b with SMTP id ip6-20020a17090b314600b0027ffa7a0a7bmr1870339pjb.33.1699539148796; Thu, 09 Nov 2023 06:12:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699539148; cv=none; d=google.com; s=arc-20160816; b=kEnEH9Bu7DdSYzK2SBneqUh/iWeVY2JoBQ+oYUGem81rR4agGZDT1Zm+7CC8njDIa6 Q+mgxheq5v7LffzyxAhAX4ESdxeyTcs/HTEgyyaiQ8SCUai3zgvmeCFcwhfyMbQaW6Ud ByQFbeMNhqzEgve5e8S24WDMPvOvaISavgoCEXxiWEn9PaIGKFHEMrObT35tuo144e44 MvdTGjM/aTqycSyRozEKNtO4Bt61MwKWvEG2GWI45GUKkkDGQvwb+Dn1dbgrIwvS2w8K oTxb2ABgSZosueoBPqXrYOh9C80CSGNF0GV/jBmiU2M/5bBLT/2D7FnlZWSTtSunEUUi ePpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=jpcERpb8rYPQ/Z9lKpcewaF9+J6iyqH2SUJfXwOgK5k=; fh=MASCYBA8Uy4n7dQedD3Iq5CUx9XJNihlWbz/p0hJpaw=; b=M0M8fZQNQovBn/g+88B9yNKeI+crrTBTdoQ//qqPuF3MgEAeodlT6FKz9UG3CTpvqC 64THL7QzDkCTQSjNfrnSiuLTQUH+WeSzTY/EyiFeCwfb5SVfmUosNSJjA5RB8tB4cWD1 y+NWX/QlFjzqNsx/T957fy5bREl4i7aRNw82iQruZxTnM5Z07VZ8wfV5fhvlNZoNteg/ W4fqUDvwowMwe7ZhUPdfA5fIzcmOQu1PLvSON7jfKFA25/CZIVg8QJQHk2MS2kcQ0OhN s/jVce5enTP162DeodS/L8Hr2hcIyLO4Qj3AxfHgdyXTtJUwLHMbtSBsji2HfwrvFrxx mMgw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id fz7-20020a17090b024700b0027d2c3f25a7si1737169pjb.80.2023.11.09.06.12.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 06:12:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 122FB80260CE; Thu, 9 Nov 2023 06:12:20 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234183AbjKIOMP (ORCPT + 32 others); Thu, 9 Nov 2023 09:12:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231586AbjKIOMO (ORCPT ); Thu, 9 Nov 2023 09:12:14 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5C40C2D75 for ; Thu, 9 Nov 2023 06:12:12 -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 B410512FC; Thu, 9 Nov 2023 06:12:56 -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 245993F64C; Thu, 9 Nov 2023 06:12:11 -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 v2] arm64/syscall: Remove duplicate declaration Date: Thu, 9 Nov 2023 14:11:53 +0000 Message-ID: <20231109141153.250046-1-kevin.brodsky@arm.com> X-Mailer: git-send-email 2.42.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 09 Nov 2023 06:12:20 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782081411158577552 X-GMAIL-MSGID: 1782095962054864592 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. A declaration is required before the call to ALLOW_ERROR_INJECTION(), so keep the original one and remove the new one. Signed-off-by: Kevin Brodsky Acked-by: Arnd Bergmann --- v1..v2: - Keep the original declarations as-is, as they are required before calling ALLOW_ERROR_INJECTION(). arch/arm64/include/asm/syscall_wrapper.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/include/asm/syscall_wrapper.h b/arch/arm64/include/asm/syscall_wrapper.h index 17f687510c48..d977713ec0ba 100644 --- a/arch/arm64/include/asm/syscall_wrapper.h +++ b/arch/arm64/include/asm/syscall_wrapper.h @@ -54,7 +54,6 @@ 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__)); \ - asmlinkage long __arm64_sys##name(const struct pt_regs *regs); \ asmlinkage long __arm64_sys##name(const struct pt_regs *regs) \ { \ return __se_sys##name(SC_ARM64_REGS_TO_ARGS(x,__VA_ARGS__)); \