aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiu Shixin <[email protected]>2022-09-23 11:33:43 +0800
committerAndrew Morton <[email protected]>2022-11-08 17:37:16 -0800
commitcddb8d09ff1e477de8236a061a5017b21bab3c14 (patch)
tree4eec40d74735279a3f49bb3447cf60ebf98c0dd7
parent946d5f9c9dcdbaedcd664fad08cea7910139d10f (diff)
mm/mmap: use hotplug_memory_notifier() directly
Commit 76ae847497bc52 ("Documentation: raise minimum supported version of GCC to 5.1") updated the minimum gcc version to 5.1. So the problem mentioned in f02c69680088 ("include/linux/memory.h: implement register_hotmemory_notifier()") no longer exist. So we can now switch to use hotplug_memory_notifier() directly rather than register_hotmemory_notifier(). Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Liu Shixin <[email protected]> Reviewed-by: David Hildenbrand <[email protected]> Cc: Christoph Lameter <[email protected]> Cc: Kefeng Wang <[email protected]> Cc: Waiman Long <[email protected]> Cc: zefan li <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
-rw-r--r--mm/mmap.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/mm/mmap.c b/mm/mmap.c
index 2def55555e05..3f47fd57d165 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -3749,13 +3749,9 @@ static int reserve_mem_notifier(struct notifier_block *nb,
return NOTIFY_OK;
}
-static struct notifier_block reserve_mem_nb = {
- .notifier_call = reserve_mem_notifier,
-};
-
static int __meminit init_reserve_notifier(void)
{
- if (register_hotmemory_notifier(&reserve_mem_nb))
+ if (hotplug_memory_notifier(reserve_mem_notifier, 0))
pr_err("Failed registering memory add/remove notifier for admin reserve\n");
return 0;