Skip to contentSkip to conversation

drivers-base-node-rename-__register_one_node-to-register_one_node.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jul 10, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: drivers/base/node: rename __register_one_node() to register_one_node()
has been removed from the -mm tree. Its filename was
drivers-base-node-rename-__register_one_node-to-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: rename __register_one_node() to register_one_node()
Date: Wed, 28 May 2025 12:18:04 -0500

The register_one_node() function was a simple wrapper around __register_one_node(). To simplify the code, register_one_node() has been removed, and __register_one_node() has been renamed to register_one_node().

---

 arch/powerpc/platforms/pseries/pci_dlpar.c |    2 +-
 drivers/base/node.c                        |    4 ++--
 include/linux/node.h                       |   13 +------------
 mm/memory_hotplug.c                        |    2 +-
 4 files changed, 5 insertions(+), 16 deletions(-)
arch/powerpc/platforms/pseries/pci_dlpar.c renamed from arch/powerpc/platforms/pseries/pci_dlpar.c~drivers-base-node-rename-__register_one_node-to-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_one_node(nid)) {
 				pr_err("PCI: Failed to register node %d\n", nid);
 			} else {
 				update_numa_distance(dn);
drivers/base/node.c renamed from drivers/base/node.c~drivers-base-node-rename-__register_one_node-to-register_one_node +2 -2
@@ -848,7 +848,7 @@ void register_memory_blocks_under_node_h
 }
 #endif /* CONFIG_MEMORY_HOTPLUG */
 
-int __register_one_node(int nid)
+int register_one_node(int nid)
 {
 	int error;
 	int cpu;
@@ -955,7 +955,7 @@ void __init node_dev_init(void)
 	 * to already created cpu devices.
 	 */
 	for_each_online_node(i) {
-		ret =  __register_one_node(i);
+		ret =  register_one_node(i);
 		if (ret)
 			panic("%s() failed to add node: %d\n", __func__, ret);
 	}
include/linux/node.h renamed from include/linux/node.h~drivers-base-node-rename-__register_one_node-to-register_one_node +1 -12
@@ -128,14 +128,7 @@ extern void unregister_node(struct node
 #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);
-
-/* Registers an online node */
-static inline int register_one_node(int nid)
-{
-	return __register_one_node(nid);
-}
-
+extern int register_one_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);
@@ -148,10 +141,6 @@ extern int register_memory_node_under_co
 static inline void node_dev_init(void)
 {
 }
-static inline int __register_one_node(int nid)
-{
-	return 0;
-}
 static inline int register_one_node(int nid)
 {
 	return 0;
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~drivers-base-node-rename-__register_one_node-to-register_one_node +1 -1
@@ -1571,7 +1571,7 @@ int add_memory_resource(int nid, struct
 		 * We online node here. We can't roll back from here.
 		 */
 		node_set_online(nid);
-		ret = __register_one_node(nid);
+		ret = register_one_node(nid);
 		BUG_ON(ret);
 	}
 

_

Patches currently in -mm which might be from [email protected] are