Commit 46bcce50 authored by Mike Rapoport (Microsoft)'s avatar Mike Rapoport (Microsoft) Committed by Andrew Morton
Browse files

arch, mm: move definition of node_data to generic code 

Every architecture that supports NUMA defines node_data in the same way:

	struct pglist_data *node_data[MAX_NUMNODES];

No reason to keep multiple copies of this definition and its forward
declarations, especially when such forward declaration is the only thing
in include/asm/mmzone.h for many architectures.

Add definition and declaration of node_data to generic code and drop
architecture-specific versions.

Link: https://lkml.kernel.org/r/20240807064110.1003856-8-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
Tested-by: Zi Yan <ziy@nvidia.com> # for x86_64 and arm64
Tested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> [arm64 + CXL via QEMU]
Acked-by: default avatarDan Williams <dan.j.williams@intel.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Rafael J. Wysocki <rafael@kernel.org>
Cc: Rob Herring (Arm) <robh@kernel.org>
Cc: Samuel Holland <samuel.holland@sifive.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 3ac9999c

arch/arm64/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ syscall-y += unistd_compat_32.h 


generic-y += early_ioremap.h

generic-y += mcs_spinlock.h

generic-y += mmzone.h

generic-y += qrwlock.h

generic-y += qspinlock.h

generic-y += parport.h

arch/arm64/include/asm/mmzone.h

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __ASM_MMZONE_H

#define __ASM_MMZONE_H



#ifdef CONFIG_NUMA



#include <asm/numa.h>



extern struct pglist_data *node_data[];

#define NODE_DATA(nid)		(node_data[(nid)])



#endif /* CONFIG_NUMA */

#endif /* __ASM_MMZONE_H */

arch/arm64/include/asm/topology.h

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/cpumask.h>



#ifdef CONFIG_NUMA

#include <asm/numa.h>



struct pci_bus;

int pcibus_to_node(struct pci_bus *bus);

arch/loongarch/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -9,5 +9,6 @@ generic-y += qrwlock.h 
generic-y += qspinlock.h

generic-y += user.h

generic-y += ioctl.h

generic-y += mmzone.h

generic-y += statfs.h

generic-y += param.h

arch/loongarch/include/asm/mmzone.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Author: Huacai Chen (chenhuacai@loongson.cn)

 * Copyright (C) 2020-2022 Loongson Technology Corporation Limited

 */

#ifndef _ASM_MMZONE_H_

#define _ASM_MMZONE_H_



#include <asm/page.h>

#include <asm/numa.h>



extern struct pglist_data *node_data[];



#define NODE_DATA(nid)	(node_data[(nid)])



#endif /* _ASM_MMZONE_H_ */