From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fout5-smtp.messagingengine.com (fout5-smtp.messagingengine.com [103.168.172.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D3CC18FC7B; Wed, 10 Jul 2024 10:27:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.148 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607261; cv=none; b=KAPCWEaXDK8iulnZrCKrIziNC9fadVcK29jRhZKzXJHlswvFv7v7zfZKWhw2hAKUrUbLJkJBkd+pFgsc49ZmvcSVAu4WiFVxCSJReKdzPvKBHMQWfOf4ixg+k/u4ITGX0Ua1b1qhGBHK+NSozjiBntJvSGcEBDQwBHQZR5MWQIU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607261; c=relaxed/simple; bh=4Sico1dlLx2cucIw1hVJsr7ffu6bFhVb6M989R6P0Gw=; h=MIME-Version:Message-Id:In-Reply-To:References:Date:From:To:Cc: Subject:Content-Type; b=F5OVXG3f0NDSD3gCyOJqqCvtPRJmSZztxK/ioBOh/M653O2VPQdXpvm8kpRoSHGcqwNPj1u5GEWV07OVrU9LXKDtV4EVZsJ8OpPRo6AvRe2FRi2vG0UrCQbWZmK9eGRPQWCwb9zLx5PAjIU6WRZ/gc9DRbIdXH0aFpgjfnhGgaM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arndb.de; spf=pass smtp.mailfrom=arndb.de; dkim=pass (2048-bit key) header.d=arndb.de header.i=@arndb.de header.b=LyoeV7gW; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=TQea+NHx; arc=none smtp.client-ip=103.168.172.148 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arndb.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arndb.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=arndb.de header.i=@arndb.de header.b="LyoeV7gW"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="TQea+NHx" Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.nyi.internal (Postfix) with ESMTP id 7FA5213807ED; Wed, 10 Jul 2024 06:27:37 -0400 (EDT) Received: from imap51 ([10.202.2.101]) by compute5.internal (MEProxy); Wed, 10 Jul 2024 06:27:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arndb.de; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1720607257; x=1720693657; bh=y7I9x5O068 rIa6OwNh1cKNoYpCATZicSDmRnAUguLsU=; b=LyoeV7gWDoZN30PXCwvf8Wxeg6 VhoBTVUhVW1s1omN6d8MKzk7jEzeXh8G5o3fMq2+GFZyBVg/9/7OEhye+/coWt2O XfAhCV6pfHeQn17iPTTX2lKtnsu7/SS85QVlYeEFAIh8HBt+aTgpZe20ljb+djY9 KkAzG4mjhKV0qUKdG0gR+2CejXzNw/FxE5kv6+1kjsvhxagXsgNXyayRyPdaQbeQ 4TBQPDKF3YFf+VvY9c/rWAvGbZGkMYb+IU1xgJ04tc8Lwn7CByXKIAgP2f3v93aA AoojIIDVoBGSZB+yjz8jXJf75ilDChNU4VltOrQAj2Dm90JSVQOz8ktykirw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1720607257; x=1720693657; bh=y7I9x5O068rIa6OwNh1cKNoYpCAT ZicSDmRnAUguLsU=; b=TQea+NHxpLxXt64jCbNK563C0E1TLCjGTuZN4XWClfBX Q+hiwNI0APwrfFgBUmFeN+FlkT0ajXZjAbuIrQNBXBMSAspspDtA+vFl5wSJsH6E cf197a4HNOG7bQXAR4Io3DEpsVFMTnNaNAdR20K7xWSpjgQ7DH48OO1jWq65WdVZ KocA8mDU0G6OXbyBpcTXLQml76zE9t4F4YwV0CnWbjiN2MSuT46ZA1ZodsAUvB1Y EMkXZXgPKUePYdiFfv6KLd+xOkVCBcPaKAeZ1lDw51o7t4aMsNfmIySSOVLdSNYT RR8pYHgQg1azc7LSxH3IoyoJBkXtKrOxBa0ztmnx8Q== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrfedugddvkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefofgggkfgjfhffhffvvefutgesthdtredtreertdenucfhrhhomhepfdetrhhn ugcuuegvrhhgmhgrnhhnfdcuoegrrhhnugesrghrnhgusgdruggvqeenucggtffrrghtth gvrhhnpeffheeugeetiefhgeethfejgfdtuefggeejleehjeeutefhfeeggefhkedtkeet ffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegrrh hnugesrghrnhgusgdruggv X-ME-Proxy: Feedback-ID: i56a14606:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id C869EB6008F; Wed, 10 Jul 2024 06:27:33 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.11.0-alpha0-568-g843fbadbe-fm-20240701.003-g843fbadb Precedence: bulk X-Mailing-List: linux-csky@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <9b269c2a-c6b5-4fa0-801b-e5e1c3ccb671@app.fastmail.com> In-Reply-To: <20240704143611.2979589-13-arnd@kernel.org> References: <20240704143611.2979589-1-arnd@kernel.org> <20240704143611.2979589-13-arnd@kernel.org> Date: Wed, 10 Jul 2024 12:27:13 +0200 From: "Arnd Bergmann" To: "Arnd Bergmann" , Linux-Arch Cc: "Masahiro Yamada" , "Nathan Chancellor" , "Nicolas Schier" , "Vineet Gupta" , "Russell King" , "Catalin Marinas" , "Will Deacon" , guoren , "Brian Cain" , "Huacai Chen" , "WANG Xuerui" , "Dinh Nguyen" , "Jonas Bonn" , "Stefan Kristiansson" , "Stafford Horne" , "Paul Walmsley" , "Palmer Dabbelt" , "Albert Ou" , "Rich Felker" , "John Paul Adrian Glaubitz" , "David S . Miller" , "Andreas Larsson" , "Christian Brauner" , "Mark Rutland" , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, "linux-csky@vger.kernel.org" , linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, "linux-openrisc@vger.kernel.org" , linux-riscv@lists.infradead.org Subject: Re: [PATCH 12/17] csky: convert to generic syscall table Content-Type: text/plain On Thu, Jul 4, 2024, at 16:36, Arnd Bergmann wrote: > - > -#define __NR_set_thread_area (__NR_arch_specific_syscall + 0) > -__SYSCALL(__NR_set_thread_area, sys_set_thread_area) > -#define __NR_cacheflush (__NR_arch_specific_syscall + 1) > -__SYSCALL(__NR_cacheflush, sys_cacheflush) > +#include > +#define __NR_sync_file_range2 __NR_sync_file_range A small update: I have folded this fixup into this patch and the hexagon one, to ensure we don't define both __NR_sync_file_range2 and __NR_sync_file_range. I already have patches to clean this up further to avoid both the #undef and #define, but that is part of a larger rework that is not ready before the merge window. Arnd diff --git a/arch/csky/include/uapi/asm/unistd.h b/arch/csky/include/uapi/asm/unistd.h index 794adbc04e48..44882179a6e1 100644 --- a/arch/csky/include/uapi/asm/unistd.h +++ b/arch/csky/include/uapi/asm/unistd.h @@ -1,4 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #include -#define __NR_sync_file_range2 __NR_sync_file_range + +#define __NR_sync_file_range2 84 +#undef __NR_sync_file_range diff --git a/arch/hexagon/include/uapi/asm/unistd.h b/arch/hexagon/include/uapi/asm/unistd.h index 6f670347dd61..a3b0cac25580 100644 --- a/arch/hexagon/include/uapi/asm/unistd.h +++ b/arch/hexagon/include/uapi/asm/unistd.h @@ -29,4 +29,5 @@ #include -#define __NR_sync_file_range2 __NR_sync_file_range +#define __NR_sync_file_range2 84 +#undef __NR_sync_file_range