mips-sgi-ip27-make-node_data-the-same-as-on-all-other-architectures.patch removed from -mm tree
The quilt patch titled
Subject: MIPS: sgi-ip27: make NODE_DATA() the same as on all other architectures
has been removed from the -mm tree. Its filename was
mips-sgi-ip27-make-node_data-the-same-as-on-all-other-architectures.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: MIPS: sgi-ip27: make NODE_DATA() the same as on all other architectures
Date: Wed, 7 Aug 2024 09:40:46 +0300
sgi-ip27 is the only system that defines NODE_DATA() differently than the rest of NUMA machines.
Add node_data array of struct pglist pointers that will point to __node_data[node]->pglist and redefine NODE_DATA() to use node_data array.
This will allow pulling declaration of node_data to the generic mm code in the next commit.
---
arch/mips/include/asm/mach-ip27/mmzone.h | 5 ++++- arch/mips/sgi-ip27/ip27-memory.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)
arch/mips/include/asm/mach-ip27/mmzone.h renamed from arch/mips/include/asm/mach-ip27/mmzone.h~mips-sgi-ip27-make-node_data-the-same-as-on-all-other-architectures +4 -1
@@ -22,7 +22,10 @@ struct node_data {extern struct node_data *__node_data[]; -#define NODE_DATA (n) (&__node_data[(n)]->pglist)#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/sgi-ip27/ip27-memory.c renamed from arch/mips/sgi-ip27/ip27-memory.c~mips-sgi-ip27-make-node_data-the-same-as-on-all-other-architectures +4 -1
@@ -34,8 +34,10 @@#define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT)#define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT) -struct node_data *__node_data[MAX_NUMNODES ]; +struct pglist_data *node_data[MAX_NUMNODES ]; +EXPORT_SYMBOL (node_data); +struct node_data *__node_data[MAX_NUMNODES ];EXPORT_SYMBOL (__node_data);static u64 gen_region_mask (void )
@@ -361,6 +363,7 @@ static void __init node_mem_init(nasid_t*/ __node_data[node] =__va (slot_freepfn <<PAGE_SHIFT );memset (__node_data[node],0 ,PAGE_SIZE ); + node_data[node] = &__node_data[node]->pglist;NODE_DATA (node)->node_start_pfn = start_pfn;NODE_DATA (node)->node_spanned_pages = end_pfn - start_pfn;
_
Patches currently in -mm which might be from [email protected] are