arch-mm-move-definition-of-node_data-to-generic-code.patch removed from -mm tree
The quilt patch titled
Subject: arch, mm: move definition of node_data to generic code
has been removed from the -mm tree. Its filename was
arch-mm-move-definition-of-node_data-to-generic-code.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Mike Rapoport (Microsoft)" <[email protected]>
Subject: arch, mm: move definition of node_data to generic code
Date: Wed, 7 Aug 2024 09:40:51 +0300
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.
---
arch/arm64/include/asm/Kbuild | 1 arch/arm64/include/asm/mmzone.h | 13 ---------- arch/arm64/include/asm/topology.h | 1 arch/loongarch/include/asm/Kbuild | 1 arch/loongarch/include/asm/mmzone.h | 16 ------------- arch/loongarch/include/asm/topology.h | 1 arch/loongarch/kernel/numa.c | 3 -- arch/mips/include/asm/mach-ip27/mmzone.h | 4 --- arch/mips/include/asm/mach-loongson64/mmzone.h | 4 --- arch/mips/loongson64/numa.c | 2 - arch/mips/sgi-ip27/ip27-memory.c | 3 -- arch/powerpc/include/asm/mmzone.h | 6 ----- arch/powerpc/mm/numa.c | 2 - arch/riscv/include/asm/Kbuild | 1 arch/riscv/include/asm/mmzone.h | 13 ---------- arch/riscv/include/asm/topology.h | 4 +++ arch/s390/include/asm/Kbuild | 1 arch/s390/include/asm/mmzone.h | 17 -------------- arch/s390/kernel/numa.c | 3 -- arch/sh/include/asm/mmzone.h | 3 -- arch/sh/mm/numa.c | 3 -- arch/sparc/include/asm/mmzone.h | 4 --- arch/sparc/mm/init_64.c | 2 - arch/x86/include/asm/Kbuild | 1 arch/x86/include/asm/mmzone.h | 6 ----- arch/x86/include/asm/mmzone_32.h | 17 -------------- arch/x86/include/asm/mmzone_64.h | 18 --------------- arch/x86/mm/numa.c | 3 -- drivers/base/arch_numa.c | 2 - include/asm-generic/mmzone.h | 5 ++++ include/linux/numa.h | 3 ++ mm/numa.c | 3 ++ 32 files changed, 22 insertions(+), 144 deletions(-)
arch/arm64/include/asm/Kbuild renamed from arch/arm64/include/asm/Kbuild~arch-mm-move-definition-of-node_data-to-generic-code +1 -0
@@ -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 deleted +0 -13
@@ -1,13 +0,0 @@ -/* 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 renamed from arch/arm64/include/asm/topology.h~arch-mm-move-definition-of-node_data-to-generic-code +1 -0
@@ -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 renamed from arch/loongarch/include/asm/Kbuild~arch-mm-move-definition-of-node_data-to-generic-code +1 -0
@@ -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 deleted +0 -16
@@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Author: Huacai Chen ([email protected]) -* 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_ */
arch/loongarch/include/asm/topology.h renamed from arch/loongarch/include/asm/topology.h~arch-mm-move-definition-of-node_data-to-generic-code +1 -0
@@ -8,6 +8,7 @@#include <linux/smp.h> #ifdef CONFIG_NUMA +#include <asm/numa.h> extern cpumask_t cpus_on_node[];
arch/loongarch/kernel/numa.c renamed from arch/loongarch/kernel/numa.c~arch-mm-move-definition-of-node_data-to-generic-code +0 -3
@@ -27,10 +27,7 @@#include <asm/time.h> int numa_off; -struct pglist_data *node_data[MAX_NUMNODES ];unsigned char node_distances[MAX_NUMNODES ][MAX_NUMNODES ]; - -EXPORT_SYMBOL (node_data);EXPORT_SYMBOL (node_distances);static struct numa_meminfo numa_meminfo;
arch/mips/include/asm/mach-ip27/mmzone.h renamed from arch/mips/include/asm/mach-ip27/mmzone.h~arch-mm-move-definition-of-node_data-to-generic-code +0 -4
@@ -24,8 +24,4 @@ extern struct node_data *__node_data[];#define hub_data (n) (&__node_data[(n)]->hub) -extern struct pglist_data *node_data[]; - -#define NODE_DATA (nid) (node_data[nid]) -#endif /* _ASM_MACH_MMZONE_H */
arch/mips/include/asm/mach-loongson64/mmzone.h renamed from arch/mips/include/asm/mach-loongson64/mmzone.h~arch-mm-move-definition-of-node_data-to-generic-code +0 -4
@@ -14,10 +14,6 @@#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[]; - -#define NODE_DATA (n) (node_data[n]) -extern void __init prom_init_numa_memory (void );#endif /* _ASM_MACH_MMZONE_H */
arch/mips/loongson64/numa.c renamed from arch/mips/loongson64/numa.c~arch-mm-move-definition-of-node_data-to-generic-code +0 -2
@@ -29,8 +29,6 @@unsigned char __node_distances[MAX_NUMNODES ][MAX_NUMNODES ];EXPORT_SYMBOL (__node_distances); -struct pglist_data *node_data[MAX_NUMNODES ]; -EXPORT_SYMBOL (node_data);cpumask_t __node_cpumask[MAX_NUMNODES ];EXPORT_SYMBOL (__node_cpumask);
arch/mips/sgi-ip27/ip27-memory.c renamed from arch/mips/sgi-ip27/ip27-memory.c~arch-mm-move-definition-of-node_data-to-generic-code +0 -3
@@ -34,9 +34,6 @@#define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT)#define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT) -struct pglist_data *node_data[MAX_NUMNODES ]; -EXPORT_SYMBOL (node_data); -struct node_data *__node_data[MAX_NUMNODES ];EXPORT_SYMBOL (__node_data);
arch/powerpc/include/asm/mmzone.h renamed from arch/powerpc/include/asm/mmzone.h~arch-mm-move-definition-of-node_data-to-generic-code +0 -6
@@ -20,12 +20,6 @@#ifdef CONFIG_NUMA -extern struct pglist_data *node_data[]; -/* -* Return a pointer to the node data for node n. -*/ -#define NODE_DATA (nid) (node_data[nid]) -/* * Following are specific to this numa platform. */
arch/powerpc/mm/numa.c renamed from arch/powerpc/mm/numa.c~arch-mm-move-definition-of-node_data-to-generic-code +0 -2
@@ -43,11 +43,9 @@ static char *cmdline __initdata;int numa_cpu_lookup_table[NR_CPUS ];cpumask_var_t node_to_cpumask_map[MAX_NUMNODES ]; -struct pglist_data *node_data[MAX_NUMNODES ];EXPORT_SYMBOL (numa_cpu_lookup_table);EXPORT_SYMBOL (node_to_cpumask_map); -EXPORT_SYMBOL (node_data);static int primary_domain_index;static int n_mem_addr_cells, n_mem_size_cells;
arch/riscv/include/asm/Kbuild renamed from arch/riscv/include/asm/Kbuild~arch-mm-move-definition-of-node_data-to-generic-code +1 -0
@@ -5,6 +5,7 @@ syscall-y += syscall_table_64.h generic-y += early_ioremap.h generic-y += flat.h generic-y += kvm_para.h +generic-y += mmzone.h generic-y += parport.h generic-y += spinlock.h generic-y += spinlock_types.h
arch/riscv/include/asm/mmzone.h deleted +0 -13
@@ -1,13 +0,0 @@ -/* 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/riscv/include/asm/topology.h renamed from arch/riscv/include/asm/topology.h~arch-mm-move-definition-of-node_data-to-generic-code +4 -0
@@ -4,6 +4,10 @@#include <linux/arch_topology.h> +#ifdef CONFIG_NUMA +#include <asm/numa.h> +#endif +/* Replace task scheduler's default frequency-invariant accounting */ #define arch_scale_freq_tick topology_scale_freq_tick#define arch_set_freq_scale topology_set_freq_scale
arch/s390/include/asm/Kbuild renamed from arch/s390/include/asm/Kbuild~arch-mm-move-definition-of-node_data-to-generic-code +1 -0
@@ -7,3 +7,4 @@ generated-y += unistd_nr.h generic-y += asm-offsets.h generic-y += kvm_types.h generic-y += mcs_spinlock.h +generic-y += mmzone.h
arch/s390/include/asm/mmzone.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* NUMA support for s390 -* -* Copyright IBM Corp. 2015 -*/ - -#ifndef _ASM_S390_MMZONE_H -#define _ASM_S390_MMZONE_H - -#ifdef CONFIG_NUMA - -extern struct pglist_data *node_data[]; -#define NODE_DATA (nid) (node_data[nid]) - -#endif /* CONFIG_NUMA */ -#endif /* _ASM_S390_MMZONE_H */
arch/s390/kernel/numa.c renamed from arch/s390/kernel/numa.c~arch-mm-move-definition-of-node_data-to-generic-code +0 -3
@@ -14,9 +14,6 @@#include <linux/node.h> #include <asm/numa.h> -struct pglist_data *node_data[MAX_NUMNODES ]; -EXPORT_SYMBOL (node_data); -void __init numa_setup (void ) {int nid;
arch/sh/include/asm/mmzone.h renamed from arch/sh/include/asm/mmzone.h~arch-mm-move-definition-of-node_data-to-generic-code +0 -3
@@ -5,9 +5,6 @@#ifdef CONFIG_NUMA #include <linux/numa.h> -extern struct pglist_data *node_data[]; -#define NODE_DATA (nid) (node_data[nid]) -static inline int pfn_to_nid (unsigned long pfn) {int nid;
arch/sh/mm/numa.c renamed from arch/sh/mm/numa.c~arch-mm-move-definition-of-node_data-to-generic-code +0 -3
@@ -14,9 +14,6 @@#include <linux/pfn.h> #include <asm/sections.h> -struct pglist_data *node_data[MAX_NUMNODES ]__read_mostly ; -EXPORT_SYMBOL_GPL (node_data); -/* * On SH machines the conventional approach is to stash system RAM * in node 0, and other memory blocks in to node 1 and up, ordered by
arch/sparc/include/asm/mmzone.h renamed from arch/sparc/include/asm/mmzone.h~arch-mm-move-definition-of-node_data-to-generic-code +0 -4
@@ -6,10 +6,6 @@#include <linux/cpumask.h> -extern struct pglist_data *node_data[]; - -#define NODE_DATA (nid) (node_data[nid]) -extern int numa_cpu_lookup_table[];extern cpumask_t numa_cpumask_lookup_table[];
arch/sparc/mm/init_64.c renamed from arch/sparc/mm/init_64.c~arch-mm-move-definition-of-node_data-to-generic-code +0 -2
@@ -1115,11 +1115,9 @@ static void init_node_masks_nonnuma(void }#ifdef CONFIG_NUMA -struct pglist_data *node_data[MAX_NUMNODES ];EXPORT_SYMBOL (numa_cpu_lookup_table);EXPORT_SYMBOL (numa_cpumask_lookup_table); -EXPORT_SYMBOL (node_data);static int scan_pio_for_cfg_handle (struct mdesc_handle *md,u64 pio,u32 cfg_handle)
arch/x86/include/asm/Kbuild renamed from arch/x86/include/asm/Kbuild~arch-mm-move-definition-of-node_data-to-generic-code +1 -0
@@ -11,3 +11,4 @@ generated-y += xen-hypercalls.h generic-y += early_ioremap.h generic-y += mcs_spinlock.h +generic-y += mmzone.h
arch/x86/include/asm/mmzone_32.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Written by Pat Gaughen ([email protected]) Mar 2002 -* -*/ - -#ifndef _ASM_X86_MMZONE_32_H -#define _ASM_X86_MMZONE_32_H - -#include <asm/smp.h> - -#ifdef CONFIG_NUMA -extern struct pglist_data *node_data[]; -#define NODE_DATA (nid) (node_data[nid]) -#endif /* CONFIG_NUMA */ - -#endif /* _ASM_X86_MMZONE_32_H */
arch/x86/include/asm/mmzone_64.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* K8 NUMA support */ -/* Copyright 2002,2003 by Andi Kleen, SuSE Labs */ -/* 2.5 Version loosely based on the NUMAQ Code by Pat Gaughen. */ -#ifndef _ASM_X86_MMZONE_64_H -#define _ASM_X86_MMZONE_64_H - -#ifdef CONFIG_NUMA - -#include <linux/mmdebug.h> -#include <asm/smp.h> - -extern struct pglist_data *node_data[]; - -#define NODE_DATA (nid) (node_data[nid]) - -#endif -#endif /* _ASM_X86_MMZONE_64_H */
arch/x86/include/asm/mmzone.h deleted +0 -6
@@ -1,6 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifdef CONFIG_X86_32 -# include <asm/mmzone_32.h> -#else -# include <asm/mmzone_64.h> -#endif
arch/x86/mm/numa.c renamed from arch/x86/mm/numa.c~arch-mm-move-definition-of-node_data-to-generic-code +0 -3
@@ -24,9 +24,6 @@int numa_off;nodemask_t numa_nodes_parsed__initdata ; -struct pglist_data *node_data[MAX_NUMNODES ]__read_mostly ; -EXPORT_SYMBOL (node_data); - static struct numa_meminfo numa_meminfo __initdata_or_meminfo; static struct numa_meminfo numa_reserved_meminfo __initdata_or_meminfo;
drivers/base/arch_numa.c renamed from drivers/base/arch_numa.c~arch-mm-move-definition-of-node_data-to-generic-code +0 -2
@@ -15,8 +15,6 @@#include <asm/sections.h> -struct pglist_data *node_data[MAX_NUMNODES ]__read_mostly ; -EXPORT_SYMBOL (node_data);nodemask_t numa_nodes_parsed__initdata ;static int cpu_to_node_map[NR_CPUS ] = { [0 ...NR_CPUS -1 ] =NUMA_NO_NODE };
include/asm-generic/mmzone.h new file +5 -0
@@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_GENERIC_MMZONE_H +#define _ASM_GENERIC_MMZONE_H + +#endif
include/linux/numa.h renamed from include/linux/numa.h~arch-mm-move-definition-of-node_data-to-generic-code +3 -0
@@ -30,6 +30,9 @@ static inline bool numa_valid_node(int n#ifdef CONFIG_NUMA #include <asm/sparsemem.h> +extern struct pglist_data *node_data[]; +#define NODE_DATA (nid) (node_data[nid]) +/* Generic implementation available */ int numa_nearest_node (int node,unsigned int state);
mm/numa.c renamed from mm/numa.c~arch-mm-move-definition-of-node_data-to-generic-code +3 -0
@@ -3,6 +3,9 @@#include <linux/printk.h> #include <linux/numa.h> +struct pglist_data *node_data[MAX_NUMNODES ]; +EXPORT_SYMBOL (node_data); +/* Stub functions: */ #ifndef memory_add_physaddr_to_nid
_
Patches currently in -mm which might be from [email protected] are