|
@@ -252,6 +252,24 @@ static inline void hugetlb_register_node(struct node *node) {}
|
|
|
static inline void hugetlb_unregister_node(struct node *node) {}
|
|
|
#endif
|
|
|
|
|
|
+static void node_device_release(struct device *dev)
|
|
|
+{
|
|
|
+ struct node *node = to_node(dev);
|
|
|
+
|
|
|
+#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HUGETLBFS)
|
|
|
+ /*
|
|
|
+ * We schedule the work only when a memory section is
|
|
|
+ * onlined/offlined on this node. When we come here,
|
|
|
+ * all the memory on this node has been offlined,
|
|
|
+ * so we won't enqueue new work to this work.
|
|
|
+ *
|
|
|
+ * The work is using node->node_work, so we should
|
|
|
+ * flush work before freeing the memory.
|
|
|
+ */
|
|
|
+ flush_work(&node->node_work);
|
|
|
+#endif
|
|
|
+ kfree(node);
|
|
|
+}
|
|
|
|
|
|
/*
|
|
|
* register_node - Setup a sysfs device for a node.
|
|
@@ -265,6 +283,7 @@ int register_node(struct node *node, int num, struct node *parent)
|
|
|
|
|
|
node->dev.id = num;
|
|
|
node->dev.bus = &node_subsys;
|
|
|
+ node->dev.release = node_device_release;
|
|
|
error = device_register(&node->dev);
|
|
|
|
|
|
if (!error){
|
|
@@ -586,7 +605,6 @@ int register_one_node(int nid)
|
|
|
void unregister_one_node(int nid)
|
|
|
{
|
|
|
unregister_node(node_devices[nid]);
|
|
|
- kfree(node_devices[nid]);
|
|
|
node_devices[nid] = NULL;
|
|
|
}
|
|
|
|