From patchwork Thu Aug 1 06:08:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13749634 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39804C3DA64 for ; Thu, 1 Aug 2024 06:09:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BDB916B0096; Thu, 1 Aug 2024 02:09:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B8BD06B0098; Thu, 1 Aug 2024 02:09:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A7ADA6B0099; Thu, 1 Aug 2024 02:09:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 8A2E46B0096 for ; Thu, 1 Aug 2024 02:09:49 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 0B9D41608E2 for ; Thu, 1 Aug 2024 06:09:49 +0000 (UTC) X-FDA: 82402650498.10.7E12C24 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf14.hostedemail.com (Postfix) with ESMTP id E14EB10001D for ; Thu, 1 Aug 2024 06:09:46 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=fyJjwiWO; spf=pass (imf14.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722492531; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=IBy4/NLvmneL8TuA1RJhZHs8+disGE/q3myWSe7l0P4=; b=HIGqNSb/VwbAshvfwocNb+mlU7B/IFZQL+nCAp+6iBZXrWuJeGRvhU4oLm8NegKZipcKA6 ElMJLnftaS0CijYdrSrAzOqvXKByFOWBq+LLWf4AXED7fje5hCcUXvgx6/LnNaFr4yBoYS VLCG6Kh4NKMo2bw6Z4tMF3JBtC+oovw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722492531; a=rsa-sha256; cv=none; b=BHX9YRd01/YWxQmVRAgo3H0GuqeVN2gd0LbJGJlvUkF/Zep5IE0J0j83KLXw7yuUnBWMcZ hJEzoNhnsfkq3lqyQPUDwK/FaK8zZi4Z+UZIHtjZ+ekT/jktTlKOcJWBO+ztzaUqkoKS+F dtP6hO2Z3IXK2S6O+Tzlmq4I6vxfH8g= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=fyJjwiWO; spf=pass (imf14.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 237266263A; Thu, 1 Aug 2024 06:09:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 881CCC4AF0C; Thu, 1 Aug 2024 06:09:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722492585; bh=jUiExhtxbXLJEeICWPE63efzW6eqLaOxDv+h7X1UR1I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fyJjwiWO5WHG4X2BzzIkyEGTY5gXOCD+ocNhSqlvP1OilB9J7rnYOnJABy+hGNW7D xyTV54Pg3gqNh0EPbnqoG/ks9lFNNaRt68ghnwEBkGMQaZxTf+nA+LyP19RicBy5Mn oBAhzFwgqXTg+F2KNHfJxuZAc+N3bPm43YahnhzEpn1k2PvuuM8oXAE1AEsUYxJerR tX/VcdeduKO5ZFtg7MixgD6k3bqZICLB50wXo+SmGeSCjFOLiA5DXhtHAdrjSd6Fih OPSoIR83ckKg/rW0fTB91OmvxgfNNKKtMbwyRz9u7AFU5KUSVbJZsnfwxQI4xSQrNV +9nKM8amxI9NA== From: Mike Rapoport To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , Andreas Larsson , Andrew Morton , Arnd Bergmann , Borislav Petkov , Catalin Marinas , Christophe Leroy , Dan Williams , Dave Hansen , David Hildenbrand , "David S. Miller" , Davidlohr Bueso , Greg Kroah-Hartman , Heiko Carstens , Huacai Chen , Ingo Molnar , Jiaxun Yang , John Paul Adrian Glaubitz , Jonathan Cameron , Jonathan Corbet , Michael Ellerman , Mike Rapoport , Palmer Dabbelt , "Rafael J. Wysocki" , Rob Herring , Samuel Holland , Thomas Bogendoerfer , Thomas Gleixner , Vasily Gorbik , Will Deacon , Zi Yan , devicetree@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-cxl@vger.kernel.org, linux-doc@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev, nvdimm@lists.linux.dev, sparclinux@vger.kernel.org, x86@kernel.org, Jonathan Cameron Subject: [PATCH v3 05/26] MIPS: loongson64: rename __node_data to node_data Date: Thu, 1 Aug 2024 09:08:05 +0300 Message-ID: <20240801060826.559858-6-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240801060826.559858-1-rppt@kernel.org> References: <20240801060826.559858-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: E14EB10001D X-Stat-Signature: xcc31ud6hzyfiq4ish9rp85eui9zcpbr X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1722492586-370978 X-HE-Meta: U2FsdGVkX18Lmqj6sT7pTQqzsh6B0MsQHOKBuFYpFQ96O5dXN3kHRvOKXBNGuZtmJRmudldOdreBiqXbk4vHscR6faLpmnsdA5u7w7CPwQsmaD3DTf9eNE+L3Hjml+tjYDD3RA+gyTgaDUAW7ogSReCOp4Wc0OhX8NE2PBW7uWEhN7c0o069msQSlDi8NMSTGxBfonuAxARz+wAX99/2DPzgEMfjmI6GYZDgUg5LONH26hv7QK2Cj+BidRwqVQJq3lb0kYXdzhXrfCbI6ndeNh6NaIqvoTY5FD6CN5oUztHhfftuMJQ6lBebvwuZxZpxLcMC/OEdgvzd0tShRaV0TjNGqwJQRviox+PDtiyGgdg+u94VXqEthkUKhm2XwEtf/7ltQ2/G2uMpvzfKS8x+KCP04gc7rCmV+gP1YtX22v/Stva2nhgHIVsBtpg6AW80Nki8s3vDXIWBscn/5s7HWcDG3o9sPDwLU+fg3+FxjQt+o3Vhh0TBuJkpp5/LkViT6b+jyuF8N2pdoI4Dg5ILlxYqo7dCuahizFWcAINt9SYEBcM1K0wurwztMnijVpYGZEl+Rdzu9U3UPQqAHE5ZCBDI9Uqp+CkCS4zuELnsZApWiPCdi0c1h/hFT4nf0rpjcGLeg5P/fUzqBXJ33miFldqYphhYO/Sxvbc49YPC1nwnxpeqqVEtHoOIX+J4A8yx56931EbDSbrLnmuJ5+LJkBBzcJ6whAgQsEkBzvDSTJpSU9uVbhDaMejPEH0ZYgYdKLTyAGIzKDgrytx0SYAjqMixrro/hXdxs363ua+K/zIqAoGJ1XW+dIjhE6JN1sgU09E7UM8lWcJKcHkwqP39u+8BdTkoOEAfRV87/uaJ59xthsVRC68gnsBibvbmAx3fZPS+xa46eYXUX6bVhnI+CvauHuwOxZ1cgFG2ZlJQM8yRD9Fe+1CJ3FqTxuooH6SYoOK/WD3E+XqtEOhzfFX nrUX89oZ 0yYHKXbx+HMfqV/e1+bDzEopKjgwy8xHOC5hX1CSSydg1L96JSfKHZgpNplLhBbxoJOFwohP7KOkQKynT8GzHEyzD5Wcj7t0dDUcVa5xqYXdhEzxuDEkxYbjQYYQk4iVg0JkK8E2jCCVoS7GMZvNi7p+FneBJlig9+6lAdX5tgicznPD/K53oKF95U8gTDy50pfdsoaBK0kYxy7tXVYrJt558+fE5imzfHRuZzGWIhGhy9qopTQAVWcG8wYcfXRxwK69ttW0MUb83/I3wtimw7VHTLTWsat6zPffIfaQAPvAf9EbJNysPNq0VLuSxmjYrtu3IXVg+jj6ELhcGvrsyqi8CsDEeIafmuksyNgtTVuQ26SM0x2qyU6/pIprqXTC0TA1mpso/XXV/8ifI8ssKZXrG/jZ8M6LsbrIdfeQ0JTfeFsI8wa5oJTJD6Q== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Mike Rapoport (Microsoft)" Make definition of node_data match other architectures. This will allow pulling declaration of node_data to the generic mm code in the following commit. Signed-off-by: Mike Rapoport (Microsoft) Reviewed-by: Jiaxun Yang Reviewed-by: David Hildenbrand Reviewed-by: Jonathan Cameron --- arch/mips/include/asm/mach-loongson64/mmzone.h | 4 ++-- arch/mips/loongson64/numa.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/mips/include/asm/mach-loongson64/mmzone.h b/arch/mips/include/asm/mach-loongson64/mmzone.h index a3d65d37b8b5..2effd5f8ed62 100644 --- a/arch/mips/include/asm/mach-loongson64/mmzone.h +++ b/arch/mips/include/asm/mach-loongson64/mmzone.h @@ -14,9 +14,9 @@ #define pa_to_nid(addr) (((addr) & 0xf00000000000) >> NODE_ADDRSPACE_SHIFT) #define nid_to_addrbase(nid) ((unsigned long)(nid) << NODE_ADDRSPACE_SHIFT) -extern struct pglist_data *__node_data[]; +extern struct pglist_data *node_data[]; -#define NODE_DATA(n) (__node_data[n]) +#define NODE_DATA(n) (node_data[n]) extern void __init prom_init_numa_memory(void); diff --git a/arch/mips/loongson64/numa.c b/arch/mips/loongson64/numa.c index 68dafd6d3e25..b50ce28d2741 100644 --- a/arch/mips/loongson64/numa.c +++ b/arch/mips/loongson64/numa.c @@ -29,8 +29,8 @@ unsigned char __node_distances[MAX_NUMNODES][MAX_NUMNODES]; EXPORT_SYMBOL(__node_distances); -struct pglist_data *__node_data[MAX_NUMNODES]; -EXPORT_SYMBOL(__node_data); +struct pglist_data *node_data[MAX_NUMNODES]; +EXPORT_SYMBOL(node_data); cpumask_t __node_cpumask[MAX_NUMNODES]; EXPORT_SYMBOL(__node_cpumask); @@ -107,7 +107,7 @@ static void __init node_mem_init(unsigned int node) tnid = early_pfn_to_nid(nd_pa >> PAGE_SHIFT); if (tnid != node) pr_info("NODE_DATA(%d) on node %d\n", node, tnid); - __node_data[node] = nd; + node_data[node] = nd; NODE_DATA(node)->node_start_pfn = start_pfn; NODE_DATA(node)->node_spanned_pages = end_pfn - start_pfn; @@ -206,5 +206,5 @@ pg_data_t * __init arch_alloc_nodedata(int nid) void arch_refresh_nodedata(int nid, pg_data_t *pgdat) { - __node_data[nid] = pgdat; + node_data[nid] = pgdat; }