diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2013-04-29 15:08:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 15:54:36 -0700 |
| commit | 6e259e7dc482d4d5e2701259ddc85ffebd957502 (patch) | |
| tree | b5c37fc51ef6259ced4b1b8f6b760ca794c5c533 /drivers/base/node.c | |
| parent | 3ac38faa1f09d7eb01497eb50eb83e4f2d132667 (diff) | |
| download | linux-3.10-6e259e7dc482d4d5e2701259ddc85ffebd957502.tar.gz linux-3.10-6e259e7dc482d4d5e2701259ddc85ffebd957502.tar.bz2 linux-3.10-6e259e7dc482d4d5e2701259ddc85ffebd957502.zip | |
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>
Diffstat (limited to 'drivers/base/node.c')
| -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 fac124a7e1c..7616a77ca32 100644 --- 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); } /* |