diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2013-04-29 18:08:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 18:54:36 -0400 |
commit | 6e259e7dc482d4d5e2701259ddc85ffebd957502 (patch) | |
tree | b5c37fc51ef6259ced4b1b8f6b760ca794c5c533 | |
parent | 3ac38faa1f09d7eb01497eb50eb83e4f2d132667 (diff) |
drivers/base/node.c: switch to register_hotmemory_notifier()
Squishes a warning which my change to hotplug_memory_notifier() added.
I want to keep that warning, because it is punishment for failnig to check
the hotplug_memory_notifier() return value.
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/base/node.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c index fac124a7e1c5..7616a77ca322 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c | |||
@@ -7,6 +7,7 @@ | |||
7 | #include <linux/mm.h> | 7 | #include <linux/mm.h> |
8 | #include <linux/memory.h> | 8 | #include <linux/memory.h> |
9 | #include <linux/vmstat.h> | 9 | #include <linux/vmstat.h> |
10 | #include <linux/notifier.h> | ||
10 | #include <linux/node.h> | 11 | #include <linux/node.h> |
11 | #include <linux/hugetlb.h> | 12 | #include <linux/hugetlb.h> |
12 | #include <linux/compaction.h> | 13 | #include <linux/compaction.h> |
@@ -683,8 +684,11 @@ static int __init register_node_type(void) | |||
683 | 684 | ||
684 | ret = subsys_system_register(&node_subsys, cpu_root_attr_groups); | 685 | ret = subsys_system_register(&node_subsys, cpu_root_attr_groups); |
685 | if (!ret) { | 686 | if (!ret) { |
686 | hotplug_memory_notifier(node_memory_callback, | 687 | static struct notifier_block node_memory_callback_nb = { |
687 | NODE_CALLBACK_PRI); | 688 | .notifier_call = node_memory_callback, |
689 | .priority = NODE_CALLBACK_PRI, | ||
690 | }; | ||
691 | register_hotmemory_notifier(&node_memory_callback_nb); | ||
688 | } | 692 | } |
689 | 693 | ||
690 | /* | 694 | /* |