From patchwork Tue Jul 16 11:13:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13734330 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 24EC6C3DA49 for ; Tue, 16 Jul 2024 11:14:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AB9406B008C; Tue, 16 Jul 2024 07:14:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A69E46B0092; Tue, 16 Jul 2024 07:14:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 958896B0093; Tue, 16 Jul 2024 07:14:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 76D4C6B008C for ; Tue, 16 Jul 2024 07:14:43 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 25F43A1729 for ; Tue, 16 Jul 2024 11:14:43 +0000 (UTC) X-FDA: 82345358046.01.0CA7072 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf13.hostedemail.com (Postfix) with ESMTP id CEDB520021 for ; Tue, 16 Jul 2024 11:14:40 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JUSkGz6f; spf=pass (imf13.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721128461; a=rsa-sha256; cv=none; b=1dJMqU5uxiWs3OoJFc7rmVmHszCf7jrGVgF+qNB1kO8io53RjRjd125w46Xst+rjQPjWlM 6T5kCw8LHdVm6V6X84aDNQxyPdR8YlG9W5DJ4HROx8JSgc9GDC39L7LrMMKb8xhh0SIfqd IeJ8Y+FSptpzVOf9SvI35BlYVD6ZArg= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JUSkGz6f; spf=pass (imf13.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 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=1721128461; 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=JbNx7SissqVvr3P2a3scVG7ImD5v5VJmKt/CBRQTJh4=; b=w3b32enx6VuALoh/SEpuRF9WSW/eyY3lIhWGRTe3HzbMu8FY1W8GgMW4EAoq8hTFSOqGfW eDymLNCFr+SsmKBP7uGAaXz7GABp/pqmrY6AMCPu59FoeYU+spA8lSAu9autfS/uhgk9tG B/5ioovUH/5nCxejXCc+ciqOQKRFbtQ= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id AA97CCE0E1D; Tue, 16 Jul 2024 11:14:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A385C4AF0E; Tue, 16 Jul 2024 11:14:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721128476; bh=RMpAE2CkAm0ph0owc8UMf/CApdEgCHWG5AjQKQzc8zQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JUSkGz6fNvh45k/VgAFPAJJWZLxB2KUqDgyy4TrA6XgfVUJTiLh4zKv9kO+uyFdE+ epJdWSRmxQe4hkiezTNX5k6uXrVfClzI0Qj6pg1Zsi/vY/FUW/9ahbwq8FO8i30WR/ CCWxbWfMmf8bq3BcU0S5xB8sbnBV9kJKryOe5db/whn81qZotEcVDB74TLoxZxANPp nLDupHb7yaSRj+yNoIU2ENv2MMfYojdUGirJDhNik7vr2QAtpZHOXRh2MD8O35cCUi Bl0Ov1SKBTkhGaRT8XDyOLq4GxQiS6O4sHzo3TCd1dzchYh6Ys7XcWv/FwwRGQX2co f+d3OUZCqU7MQ== 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" , Greg Kroah-Hartman , Heiko Carstens , Huacai Chen , Ingo Molnar , Jiaxun Yang , John Paul Adrian Glaubitz , Jonathan Cameron , Michael Ellerman , Mike Rapoport , Palmer Dabbelt , "Rafael J. Wysocki" , Rob Herring , Thomas Bogendoerfer , Thomas Gleixner , Vasily Gorbik , Will Deacon , linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linux-mips@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-acpi@vger.kernel.org, linux-cxl@vger.kernel.org, nvdimm@lists.linux.dev, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org Subject: [PATCH 03/17] MIPS: loongson64: rename __node_data to node_data Date: Tue, 16 Jul 2024 14:13:32 +0300 Message-ID: <20240716111346.3676969-4-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240716111346.3676969-1-rppt@kernel.org> References: <20240716111346.3676969-1-rppt@kernel.org> MIME-Version: 1.0 X-Stat-Signature: ca1y5y3ypus7qsc1dskw3wgmnd53hdbp X-Rspamd-Queue-Id: CEDB520021 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1721128480-383357 X-HE-Meta: U2FsdGVkX1/FbHL3+YUMMgOIP9f2KOj4slukWKa3doZqvvdzgF1nXWPN/L+stYVVF5+WPKc4vtpEree29Gb8xi6+KTpRjbjo7UYFRfC+gnPJdJB9CgbIJerZM/CI1KyFARxbnQHeD8pKH074/G56WGqFMT+57vjIVXZlG+s9qxTzBPSfEKJZ+XWmz1mm6ipP2FOnThX93g8/Ja+37i+lRZzZqYfyLLSk979P5c9AA/BY+NurDROrZ40uKf368+f4EAh9yCh9i9ig8JRlGnbKbdZdd9avHRl+uF5Gdvrgi1tp5n4r3M2IRCB2IQ0YNetq3LBii/U1EUA5RRqmt3gUCku8P4aG39S+KdI3UwytkIaph83Ht56ITmxGJ4ZTcNB16E/MksmQRnbagQn6H08V2f/GXJRLAqBPyGoca6NSBFOJiSyLVYnjJehf6BbXWHGjXNZLuvbFXUZc4zo6RRdUELrTd+7cwEeOP6uyLBm3EPiKP8EMmsxxOn30PIy90RGt1QvKHmAfoMM7sG9qaU9mkug3uyW/fAmwybn/42I68e8xOao1fdR8qq/NzOhKny0kYO8GcMOI4mWTKxTb2Rth83zYFTOiDcnSlMzbro+J8KoZc3Z7dIHWWZ+JVD80oHGm7Mq9eGibh1N3hk4vgPhJQftf/U1/8Lvc5HesyjzhKkTIOZGggax9IlBa/iudLXqmxtxPubYU06NVzLR/sjr5NdME4nLOhK51BTWGvY05xTEIvZJNzf7GBkhneUS5+Ysz0MpOl5qTDCIxY6f2Kq7204OtRlzg57USjqLilSgPCQESzaKNMbhjD+pjlgIZDa+U6cGGL4y4QE096kYzImrbTFGrWU/52qtheiG3MzZ3XFpmtheaRQ66voCCZuur/hG6C/Dt9w1/0N97zO1ER67l0T7DhBUK4HDZsCQHkkvIvxswO3BM1wCR19pUyZZPZuahZDG9L765RiY7EjObqhE mDIDw0Tu HyV2DbmErgnXKVYqIlPRNX2bSPORcaLtUo0uSrw3sLXx3PcmMwKLjFnUSZuFMjFDK36u1CqBWUxkkg/Jvq9EtCk7ocxXahSlg/ZRZxZDLHrNG/4Ew9MEBIDe4nGB8x5O2QOddHF8DQ2daU9bDvpVHKF6thEjF17tRBBHSiANgG3VD5EWUlv1qQD86t7pViwYjuNw7kxXtAtjZDLc+JX1PJwxGCk7VTjem0QCSTprVLDYYCUkJo5zs26hYQp+x9IRbaC2pd+wgypLg9m12ZS9I24qNVvwWZut/ho7+ 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; }