1 files changed, 18 insertions, 34 deletions

diff --git a/drivers/base/node.c b/drivers/base/node.c
index ce27be2d001d..9fe33d3e2d3b 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -420,8 +420,6 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, void *arg)
         int ret, nid = *(int *)arg;
         unsigned long pfn, sect_start_pfn, sect_end_pfn;
 
-        mem_blk->nid = nid;
-
         sect_start_pfn = section_nr_to_pfn(mem_blk->start_section_nr);
         sect_end_pfn = section_nr_to_pfn(mem_blk->end_section_nr);
         sect_end_pfn += PAGES_PER_SECTION - 1;
@@ -450,6 +448,13 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, void *arg)
                         if (page_nid != nid)
                                 continue;
                 }
+
+                /*
+                 * If this memory block spans multiple nodes, we only indicate
+                 * the last processed node.
+                 */
+                mem_blk->nid = nid;
+
                 ret = sysfs_create_link_nowarn(&node_devices[nid]->dev.kobj,
                                         &mem_blk->dev.kobj,
                                         kobject_name(&mem_blk->dev.kobj));
@@ -464,40 +469,19 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, void *arg)
         return 0;
 }
 
-/* unregister memory section under all nodes that it spans */
-int unregister_mem_sect_under_nodes(struct memory_block *mem_blk,
-                                    unsigned long phys_index)
+/*
+ * Unregister a memory block device under the node it spans. Memory blocks
+ * with multiple nodes cannot be offlined and therefore also never be removed.
+ */
+void unregister_memory_block_under_nodes(struct memory_block *mem_blk)
 {
-        NODEMASK_ALLOC(nodemask_t, unlinked_nodes, GFP_KERNEL);
-        unsigned long pfn, sect_start_pfn, sect_end_pfn;
-
-        if (!mem_blk) {
-                NODEMASK_FREE(unlinked_nodes);
-                return -EFAULT;
-        }
-        if (!unlinked_nodes)
-                return -ENOMEM;
-        nodes_clear(*unlinked_nodes);
-
-        sect_start_pfn = section_nr_to_pfn(phys_index);
-        sect_end_pfn = sect_start_pfn + PAGES_PER_SECTION - 1;
-        for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) {
-                int nid;
+        if (mem_blk->nid == NUMA_NO_NODE)
+                return;
 
-                nid = get_nid_for_pfn(pfn);
-                if (nid < 0)
-                        continue;
-                if (!node_online(nid))
-                        continue;
-                if (node_test_and_set(nid, *unlinked_nodes))
-                        continue;
-                sysfs_remove_link(&node_devices[nid]->dev.kobj,
-                         kobject_name(&mem_blk->dev.kobj));
-                sysfs_remove_link(&mem_blk->dev.kobj,
-                         kobject_name(&node_devices[nid]->dev.kobj));
-        }
-        NODEMASK_FREE(unlinked_nodes);
-        return 0;
+        sysfs_remove_link(&node_devices[mem_blk->nid]->dev.kobj,
+                          kobject_name(&mem_blk->dev.kobj));
+        sysfs_remove_link(&mem_blk->dev.kobj,
+                          kobject_name(&node_devices[mem_blk->nid]->dev.kobj));
 }
 
 int link_mem_sections(int nid, unsigned long start_pfn, unsigned long end_pfn)