drivers-base-node-fold-register_node-into-register_one_node.patch removed from -mm tree
The quilt patch titled
Subject: drivers/base/node: fold register_node() into register_one_node()
has been removed from the -mm tree. Its filename was
drivers-base-node-fold-register_node-into-register_one_node.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: Donet Tom <[email protected]>
Subject: drivers/base/node: fold register_node() into register_one_node()
Date: Tue, 14 Oct 2025 21:09:16 +0530
Patch series "drivers/base/node: fold node register and unregister functions", v2.
The first patch merges register_one_node() and register_node(), leaving a single register_node() function.
The second patch merges unregister_one_node() and unregister_node(), leaving a single unregister_node() function.
There are no functional changes in these patches.
This patch (of 2):
register_node() is only called from register_one_node(). This patch folds register_node() into its only caller and renames register_one_node() to register_node().
This reduces unnecessary indirection and simplifies the code structure. No functional changes are introduced.
---
arch/powerpc/platforms/pseries/pci_dlpar.c | 2 arch/x86/mm/numa.c | 4 - drivers/base/node.c | 52 +++++++------------ include/linux/node.h | 4 - mm/memory_hotplug.c | 4 - mm/mm_init.c | 2 6 files changed, 28 insertions(+), 40 deletions(-)
arch/powerpc/platforms/pseries/pci_dlpar.c renamed from arch/powerpc/platforms/pseries/pci_dlpar.c~drivers-base-node-fold-register_node-into-register_one_node +1 -1
@@ -29,7 +29,7 @@ struct pci_controller *init_phb_dynamic( nid =of_node_to_nid (dn);if (likely ((nid) >=0 )) {if (!node_online (nid)) { -if (register_one_node (nid)) { +if (register_node (nid)) {pr_err ("PCI: Failed to register node %d\n" , nid); }else {update_numa_distance (dn);
arch/x86/mm/numa.c renamed from arch/x86/mm/numa.c~drivers-base-node-fold-register_node-into-register_one_node +2 -2
@@ -262,7 +262,7 @@ void __init init_gi_nodes(void)* bringup_nonboot_cpus * cpu_up * __try_online_node -* register_one_node +* register_node * because node_subsys is not initialized yet. * TODO remove dependency on node_online */
@@ -303,7 +303,7 @@ void __init init_cpu_to_node(void)* bringup_nonboot_cpus * cpu_up * __try_online_node -* register_one_node +* register_node * because node_subsys is not initialized yet. * TODO remove dependency on node_online */
drivers/base/node.c renamed from drivers/base/node.c~drivers-base-node-fold-register_node-into-register_one_node +20 -32
81 lines not on this page · raw message
include/linux/node.h renamed from include/linux/node.h~drivers-base-node-fold-register_node-into-register_one_node +2 -2
@@ -176,7 +176,7 @@ static inline int hotplug_node_notifier(#ifdef CONFIG_NUMA extern void node_dev_init (void );/* Core of the node registration - only memory hotplug should use this */ -extern int register_one_node (int nid); +int register_node (int nid);extern void unregister_one_node (int nid);extern int register_cpu_under_node (unsigned int cpu,unsigned int nid);extern int unregister_cpu_under_node (unsigned int cpu,unsigned int nid);
@@ -189,7 +189,7 @@ extern int register_memory_node_under_costatic inline void node_dev_init (void ) { } -static inline int register_one_node (int nid) +static inline int register_node (int nid) {return 0 ; }
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~drivers-base-node-fold-register_node-into-register_one_node +2 -2
@@ -1311,7 +1311,7 @@ static int __try_online_node(int nid, boif (set_node_online) {node_set_online (nid); - ret =register_one_node (nid); + ret =register_node (nid);BUG_ON (ret); } out:
@@ -1542,7 +1542,7 @@ int add_memory_resource(int nid, struct goto error_memblock_remove;if (ret) {node_set_online (nid); - ret =register_one_node (nid); + ret =register_node (nid);if (WARN_ON (ret)) {node_set_offline (nid); goto error_memblock_remove;
mm/mm_init.c renamed from mm/mm_init.c~drivers-base-node-fold-register_node-into-register_one_node +1 -1
@@ -1909,7 +1909,7 @@ void __init free_area_init(unsigned longfree_area_init_node (nid);/* -* No sysfs hierarchy will be created via register_one_node() +* No sysfs hierarchy will be created via register_node() *for memory-less node because here it's not marked as N_MEMORY *and won't be set online later. The benefit is userspace *program won't be confused by sysfs files/directories of
_
Patches currently in -mm which might be from [email protected] are