From patchwork Thu Dec 22 11:46:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 35691 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp277989wrn; Thu, 22 Dec 2022 03:50:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXtkbeot/Z50gM/xMOohrmTng/Xk8+BzwXF3UgGom6JlACQkPh/+byJTUjbI6p947aXfDCL/ X-Received: by 2002:a17:906:2457:b0:7c0:ff72:e828 with SMTP id a23-20020a170906245700b007c0ff72e828mr4543136ejb.54.1671709818900; Thu, 22 Dec 2022 03:50:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671709818; cv=none; d=google.com; s=arc-20160816; b=oB2dONUroKAEehibdr9Xc5phhkYfiGc/8PTTyyugZB9nuCArZzYYJafR+E3F8+7k10 XXas6kBRbefWk8ex6cITEljYqHvk+bP/CtlE9OU+Axd/Dmk4JCuo1nlG9rKgoLmK41zL TgWTNSmvBFbVQ0jU/lAWBq/oQG4QxIkIcK6awYk6ovGhci3kmB/pKdJoHBi64SZAiS9Z eH6dKqbjjWys9tUE1+s/HNagE9YsThjwl7gmmaWEH85eeqLuvIR/XUS5G5xlgC5olwmR OBzGNiCuCRLA5kqo2t6m3kkMGH+AC/kHwo0lsq3Kt6hJ+Ug9SwG8m7mNfYvEBl5pjAtN dhDw== 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=YJ6zpiYoLc0LQN8UJyFEgfs3RdALryTNRVR2m0n0Y1Y=; b=Ldk1ZDIiybxE3wfl5pfnQ2IDTfpxCVsdUmPejWQiH6k5dkZ5Sloa8xkk6JdThQlSEx QaHUWghav/5B7XRpg00qB/JO32H3vSGYZMPDepjSCdsfT65vKVC1H/v9aqtBY0u9S0YF yzxc7FCgz1Pu/aTxlYAf6WBz2Jtmb4GbCji6kGCyqnLqhcH7Qo3S/Lx4p0DTg0MLACE3 UjWHekmc5Dzu71T2efkMie+Oq/jUE8U1Pr+eykFRUtRoL0vpP/y3rB5Nuz3Pmoyji6Pz OFgIzuvjqJ6LmLzKilceZNvmmHOfkPgUXneRNiahgZrj0iJ4wJfEpGWbJAf06LOKSjkF UTEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="VO/78JB9"; 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 xb8-20020a170907070800b0077b45792af2si308531ejb.464.2022.12.22.03.49.54; Thu, 22 Dec 2022 03:50:18 -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="VO/78JB9"; 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 S235510AbiLVLtJ (ORCPT + 99 others); Thu, 22 Dec 2022 06:49:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235523AbiLVLsB (ORCPT ); Thu, 22 Dec 2022 06:48:01 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A110928E25; Thu, 22 Dec 2022 03:47:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671709673; x=1703245673; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+VGlWrUtqaEIUqy2OBJn82lI4eJE+r4QbaGV3gKpeCE=; b=VO/78JB9/yNQwWe+VaSRKu1uUXp2V4Gh3K1pAeIvfbclWGrQqGHLtlYR dF/1jp/xDpKOJhhA4AWlguZTA7TToSdUlYjNClaLx2++Z8E3MOeN5dChl Ub2evcY16CLcthTlrmloP1nTRuqz5nygeKlmeXJU10NlqmwHk5NATiu3Q GifTiEOHQ7oBy9R8IaWpVMRbJHj0wOQZrUifT9haRrrceoz6gF4aYfK/Q 7XMQGOx8/EdmRlQJmrl4rSL45c9qU4qIObISrQ15asAWsZifkUtIkl54d VKq2tydp4Sm3UbvJ4gEiVN8VEAOdxTqdXK8oPWfrKBCuJw5hZacPcS5t8 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10568"; a="318804536" X-IronPort-AV: E=Sophos;i="5.96,265,1665471600"; d="scan'208";a="318804536" 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:47:48 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10568"; a="629504464" X-IronPort-AV: E=Sophos;i="5.96,265,1665471600"; d="scan'208";a="629504464" 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:47: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 04/19] arch/arm64: rename internal name __xchg to __arch_xchg Date: Thu, 22 Dec 2022 12:46:20 +0100 Message-Id: <20221222114635.1251934-5-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?1752914795444553111?= X-GMAIL-MSGID: =?utf-8?q?1752914795444553111?= __xchg will be used for non-atomic xchg macro. Signed-off-by: Andrzej Hajda --- arch/arm64/include/asm/cmpxchg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/cmpxchg.h b/arch/arm64/include/asm/cmpxchg.h index 497acf134d9923..3a36ba58e8c2ef 100644 --- a/arch/arm64/include/asm/cmpxchg.h +++ b/arch/arm64/include/asm/cmpxchg.h @@ -62,7 +62,7 @@ __XCHG_CASE( , , mb_, 64, dmb ish, nop, , a, l, "memory") #undef __XCHG_CASE #define __XCHG_GEN(sfx) \ -static __always_inline unsigned long __xchg##sfx(unsigned long x, \ +static __always_inline unsigned long __arch_xchg##sfx(unsigned long x, \ volatile void *ptr, \ int size) \ { \ @@ -93,7 +93,7 @@ __XCHG_GEN(_mb) ({ \ __typeof__(*(ptr)) __ret; \ __ret = (__typeof__(*(ptr))) \ - __xchg##sfx((unsigned long)(x), (ptr), sizeof(*(ptr))); \ + __arch_xchg##sfx((unsigned long)(x), (ptr), sizeof(*(ptr))); \ __ret; \ })