Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[firefly-linux-kernel-4.4.55.git] / drivers / base / node.c

diff --git a/drivers/base/node.c b/drivers/base/node.c
index fac124a7e1c5b0203b4953e6fd30ce9fbfe5c290..7616a77ca322580958d4f21fff99a54d883440c0 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -7,6 +7,7 @@
 #include <linux/mm.h>
 #include <linux/memory.h>
 #include <linux/vmstat.h>
+#include <linux/notifier.h>
 #include <linux/node.h>
 #include <linux/hugetlb.h>
 #include <linux/compaction.h>
@@ -683,8 +684,11 @@ static int __init register_node_type(void)
 
        ret = subsys_system_register(&node_subsys, cpu_root_attr_groups);
        if (!ret) {
-               hotplug_memory_notifier(node_memory_callback,
-                                       NODE_CALLBACK_PRI);
+               static struct notifier_block node_memory_callback_nb = {
+                       .notifier_call = node_memory_callback,
+                       .priority = NODE_CALLBACK_PRI,
+               };
+               register_hotmemory_notifier(&node_memory_callback_nb);
        }
 
        /*