From patchwork Thu Dec 22 11:46:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 35701 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp279034wrn; Thu, 22 Dec 2022 03:53:04 -0800 (PST) X-Google-Smtp-Source: AMrXdXs0YDLaCWRa+wKHva3EtiaEMMKckBaHs6iumFabsAv+9UwrjLoLiRnR8t976sKzIX3xmxrE X-Received: by 2002:a17:907:6d0b:b0:83f:1f64:c1e with SMTP id sa11-20020a1709076d0b00b0083f1f640c1emr4681288ejc.47.1671709984574; Thu, 22 Dec 2022 03:53:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671709984; cv=none; d=google.com; s=arc-20160816; b=Ta0s5oSXCiOT2vCcLPC6mHbP0ci/CjrUP0GwsBS3K3Pw8pZIoasOuftxpPAJhEXmOJ rjUDvPrJbloI8kQlK8yJfWoM7SQrcxqPQkoODNM87wQ7lnOSPkGVIFW9nZNCi0GI40jw d45xE7C8F0qVuaLl+Tcrk+YbH8hhjuGY1UuZBkoFRGP1cn2atjumrsB5JzeBxY912B7v CaC85B7F3g79KotEkMlXjXZoppPZMHvz4z0RP24bd117AAwF6tTwrQW50KFoZjS3WmfR Jr7rdsS0IqDKXRXkGIj2MkIk4IQ5hM5YCBq/h/zcDDFE6BjhECwR/iz6NqOGvs6liNk+ lz9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:organization :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tTRTqiURJx5B6KffhzGU0T/vqt63AUTxClEyvhGqmj4=; b=z1dzG2pbaFvZwgd44mPICkFRiXFNiOf5WbwBfcgy4SGNFyDG6+VpDz2SQ0TiLJj/k7 7RhynA9ED6K6VTrFscgVfnE+hoXod9IazMPAWTaVcnzF3a3uYK2SHqVpMOdjmRjSeuVq hFElg+FyQ/+ZNgAe7Jg9wZsqgtf97PLkUXyOSFFeANhQ1E8C5kOg2xaLhFLO05H6i0m2 pCbNe4mZ061QgUOsSj2DkEC2Z/dPvY5U8M7bcT7+t5xLU0eRT7x8hCqwMia2JjWcwtaC syqqPw2WdOV0wKltB14YM4ANdggRcJdQye487Npd4UO8XbH413CSqLDRy8Nysdd5Y80I frTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=U0BmhAep; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cs14-20020a170906dc8e00b007c0a4c149bfsi335355ejc.403.2022.12.22.03.52.40; Thu, 22 Dec 2022 03:53:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=U0BmhAep; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235657AbiLVLwG (ORCPT + 99 others); Thu, 22 Dec 2022 06:52:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235592AbiLVLuK (ORCPT ); Thu, 22 Dec 2022 06:50:10 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E17E2A507; Thu, 22 Dec 2022 03:48:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671709729; x=1703245729; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DkmV3GJS9Tl7SCqcbYCFpqWizdAnQdaBoGDZyzrrlMs=; b=U0BmhAephbtLYyf0Vjz6msALEi6SYPY8giKxBYL6+m2y9mr+vNYTSCZi Z/vj+JFBLOSdLI4nKJ+DhnZ7m6IqIpV929IjZNKfePm0h5s18LIfWbbjZ wo5ac6rAINNCd9T/rYl4/aU5l3JdkMsv8JhgSEkXC2fB2jvFAOClWIVGO umFVzsfNbPH71v42mISt0w98Qz3plkmLQUhmFjchytxQWDlAZUt2pf926 jinEYfu2JL6CEZKqzvHRClk85PNyb+LFKzS5soIUk3okqabwRYR7fJmAr yRw/ikvLSwKrJ82hmZOk57ilEsNdFiPJCu6zyHpjVwt1RC+PiUqABlsWO Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10568"; a="318804825" X-IronPort-AV: E=Sophos;i="5.96,265,1665471600"; d="scan'208";a="318804825" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2022 03:48:48 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10568"; a="629504846" X-IronPort-AV: E=Sophos;i="5.96,265,1665471600"; d="scan'208";a="629504846" Received: from lab-ah.igk.intel.com ([10.91.215.196]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2022 03:48:42 -0800 From: Andrzej Hajda To: linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, openrisc@lists.librecores.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: Andrzej Hajda , Arnd Bergmann , Rodrigo Vivi , Andrew Morton , Andy Shevchenko , Peter Zijlstra , Boqun Feng , Mark Rutland Subject: [PATCH 14/19] arch/s390: rename internal name __xchg to __arch_xchg Date: Thu, 22 Dec 2022 12:46:30 +0100 Message-Id: <20221222114635.1251934-15-andrzej.hajda@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221222114635.1251934-1-andrzej.hajda@intel.com> References: <20221222114635.1251934-1-andrzej.hajda@intel.com> MIME-Version: 1.0 Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752914968753362458?= X-GMAIL-MSGID: =?utf-8?q?1752914968753362458?= __xchg will be used for non-atomic xchg macro. Signed-off-by: Andrzej Hajda --- arch/s390/include/asm/cmpxchg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/s390/include/asm/cmpxchg.h b/arch/s390/include/asm/cmpxchg.h index 84c3f0d576c5b1..efc16f4aac8643 100644 --- a/arch/s390/include/asm/cmpxchg.h +++ b/arch/s390/include/asm/cmpxchg.h @@ -14,7 +14,7 @@ void __xchg_called_with_bad_pointer(void); -static __always_inline unsigned long __xchg(unsigned long x, +static __always_inline unsigned long __arch_xchg(unsigned long x, unsigned long address, int size) { unsigned long old; @@ -77,7 +77,7 @@ static __always_inline unsigned long __xchg(unsigned long x, __typeof__(*(ptr)) __ret; \ \ __ret = (__typeof__(*(ptr))) \ - __xchg((unsigned long)(x), (unsigned long)(ptr), \ + __arch_xchg((unsigned long)(x), (unsigned long)(ptr), \ sizeof(*(ptr))); \ __ret; \ })