From patchwork Tue Jul 23 06:41:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13739432 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 090F7C3DA63 for ; Tue, 23 Jul 2024 06:43:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 917D66B0099; Tue, 23 Jul 2024 02:43:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C7DF6B009A; Tue, 23 Jul 2024 02:43:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B6686B009B; Tue, 23 Jul 2024 02:43:21 -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 5DC2D6B0099 for ; Tue, 23 Jul 2024 02:43:21 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 180D1A5F48 for ; Tue, 23 Jul 2024 06:43:21 +0000 (UTC) X-FDA: 82370075802.07.2299E05 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf18.hostedemail.com (Postfix) with ESMTP id CEC611C002D for ; Tue, 23 Jul 2024 06:43:18 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=OfSN7mfv; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf18.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721716947; 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=fRc0vSz3pIb7YlflLT5jJwuHjIijmYVVLWY6rhuhNC1WFTvAQZtUOpI4uyxaKylkS9A+iD tehpjDb/V+10U7RgGmnRW2X1spfk8sDcZnUqtJZ+x/Ia5ba3g2+eKWqUfXv/ArSgRuGZfd J2cB77BK5uvOOpC7I+OmdeuzuMa8Pd8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721716947; a=rsa-sha256; cv=none; b=W2WVo9kB5b5EyuEfh9XdsTWorfHvnIbozmtTsGt5RSsgYq+8S42TfidNdZb+a10sQ2joSn 9qEKXuYJuxGDJbqNnZgzwS/oHVKfXenbqD0eBWrHGFtt23M0wfvVeLR81Y2tgps4kOtVRV /29JMJHfssEEsCnfXj0wy8rhLB154Sw= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=OfSN7mfv; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf18.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 08502CE0E01; Tue, 23 Jul 2024 06:43:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A439C4AF0F; Tue, 23 Jul 2024 06:43:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721716995; bh=jUiExhtxbXLJEeICWPE63efzW6eqLaOxDv+h7X1UR1I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OfSN7mfvIUHKBfqIhZu4h7qRRVMm+y8oNmA1PZ8IOgiRONyTkevyAn920tkmmmcKr xpP457bzAjQ5o9Old6pNpgfaMN77kH+wg/flNiNsqar5IJx3UlJfc28GlDvb8g/Nki 8YLM7G4hBB754wH8MzGzVejX8YEGGOFCBD+gjj204V9qWaf5iAgw1msKGw+93wNdiU Y/T9WsphBVb4jLUNIMh8fHzvQY7N57NFxeSu7sOI1PkKRtoBgEoaNx50ekhLLAYrkT rCehBGnW5IqnZfy3tDX8e9KwEEcASO0sRUWPNvbMrIy6RXKo7V247p2U1rVniZYinl SIgVomUX1tYbQ== 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 v2 05/25] MIPS: loongson64: rename __node_data to node_data Date: Tue, 23 Jul 2024 09:41:36 +0300 Message-ID: <20240723064156.4009477-6-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240723064156.4009477-1-rppt@kernel.org> References: <20240723064156.4009477-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: CEC611C002D X-Stat-Signature: jye6ackgfgueb6ob4udj8wa7p6w1bozs X-Rspam-User: X-HE-Tag: 1721716998-355570 X-HE-Meta: U2FsdGVkX1+HxyCW6/+TCwPsBT7OcE9H5a6pQC2xBuK88ypVtmbUPCtWH6tW6HEzXAsyAqlsYkX2+sJKZQaHk7uPMKF6liDODpG3tpVxo6uG1ad21l38l1oYPLHeY9nUtSDidRz0vXuzjVrstw/OargPc27Uo8mGpTKJQ9zP5W1eQLZpaSVfVukhtwQ19qe2oo4AZW3yyZ28YPTt97qVkMI9t8mb0k9ev3BfzUjbC0qA6sydOlmhQBq3b/YqZjUbSPhZ8Ryaxc+m2x2W3s1znuN39/T8kmLWn+ZwWfcYQB2HBlJGEMSSbXOkAa9knpioYQB4e1osTPxURE5Z+7OxaTD97ytRBFdzIA5WbSZ/DHqctgK1s3W88OfRkM2MUQYjsOffTC1MNcwhxwpuUK3uLiFUPty+qDweJg3jxIFWBl+EvaJSYH06Ekw4S0BrQjVnJBGQH9DRv8pwCBxlopbjxf5PFjYRPe6j4LXJ8QbNu7rZ1/0vGAJTeZMh1PpTIg/b2ILRWBauvITIigabBCgS7hgQ5i0AQP4gfIbUZ//4kOzwzCy61S0WeZWAWPeSFva7WGmJbQ4T0PfWzqWtaqQzqIzNjbYKleVgEXIsywFa7VqAO4jSJyD254sIjEMEQIWHBB6B3wRzadaqZMitUggNCmGWxcBVnDg0MxaXdiGdq8T6efmmIv1OWJoXenAknXdIiaGKTpA4bmwnsuz68h9/lYPxGpyGYZF346jfI/9Kv2NMLBzG0f8EyCajTupLl43dfMF3wiGWtMsnbCi+5Rsy0Xwsbhzi3Z31t5GnSWCXK7+azROhxI+lGDf8+fGcQZAbw3MLCsAjO68sgnaQxWC//k1ZOAVtpar6egUCVbysQbszcRRksxdPoqjuBEad0QvPAorEPhBqQEg+yCxgUFWcTrhjl/a4CCAQR3CNJLFWWSYSiJiAizNXOAFhBMFrPQ7R5Uw0h8/ihP2ZMmCebeU FoNvHiDi A87u89hU4etspFLOKL4zSGGv5tBxnSIzOP2032P+0+Bm5hR+f5z7pMA436iQrAHewgmczd1WR2uzD7SOj1RZBdKw0t/UGJYodIjEk5MHdmOrl6dl4kQ65ZhhgmFJnbw8bZ8DIt0iFnoXv2jMbloE6JSwkN/yNWE7vcAdYs3D5VjhetiDrJG4yWAg60a3Po7fg1EYMQDtbJJva1km/iY/Xi87bklF8yfXSAJb9HZai7KQ6kKH2m0q1pGLVYFqdgyTo6qFD88srFktjB/RXLkxY4VeVoscrdg+yAzRymxK4zstd9Woj9CjEi4StIk7SRD/q5+XHIgMKutkysWq004qkx9GtLA/U6reWPp8vZVf+7Gvd8X7B5UsaqhwfTreWrAKy1GRBJjYzEnf2dYQa2+PlVCikRazNfzIuGOk7xo+ER/ULEtvz5G5iuQQrrQ== 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; }