--- v5
+++ v8
@@ -20,14 +20,14 @@
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
---
- drivers/base/node.c | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
+ drivers/base/node.c | 11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/drivers/base/node.c b/drivers/base/node.c
-index af1a177..9bc2f57 100644
+index af1a177..07523fb 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
-@@ -252,6 +252,13 @@ static inline void hugetlb_register_node(struct node *node) {}
+@@ -252,6 +252,16 @@ static inline void hugetlb_register_node(struct node *node) {}
static inline void hugetlb_unregister_node(struct node *node) {}
#endif
@@ -35,13 +35,16 @@
+{
+ struct node *node_dev = to_node(dev);
+
++#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HUGETLBFS)
+ flush_work(&node_dev->node_work);
++#endif
++
+ memset(node_dev, 0, sizeof(struct node));
+}
/*
* register_node - Setup a sysfs device for a node.
-@@ -265,6 +272,7 @@ int register_node(struct node *node, int num, struct node *parent)
+@@ -265,6 +275,7 @@ int register_node(struct node *node, int num, struct node *parent)
node->dev.id = num;
node->dev.bus = &node_subsys;