Merge tag 'acpi-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-microblaze.git] / include / linux / node.h

diff --git a/include/linux/node.h b/include/linux/node.h
index 014ba3a..8e5a298 100644 (file)
--- a/include/linux/node.h
+++ b/include/linux/node.h
@@ -99,15 +99,14 @@ extern struct node *node_devices[];
 typedef  void (*node_registration_func_t)(struct node *);
 
 #if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_NUMA)
-int link_mem_sections(int nid, unsigned long start_pfn,
-                     unsigned long end_pfn,
-                     enum meminit_context context);
+void link_mem_sections(int nid, unsigned long start_pfn,
+                      unsigned long end_pfn,
+                      enum meminit_context context);
 #else
-static inline int link_mem_sections(int nid, unsigned long start_pfn,
-                                   unsigned long end_pfn,
-                                   enum meminit_context context)
+static inline void link_mem_sections(int nid, unsigned long start_pfn,
+                                    unsigned long end_pfn,
+                                    enum meminit_context context)
 {
-       return 0;
 }
 #endif
 
@@ -130,8 +129,7 @@ static inline int register_one_node(int nid)
                if (error)
                        return error;
                /* link memory sections under this node */
-               error = link_mem_sections(nid, start_pfn, end_pfn,
-                                         MEMINIT_EARLY);
+               link_mem_sections(nid, start_pfn, end_pfn, MEMINIT_EARLY);
        }
 
        return error;