Since patch 316346243be6 has already updated the minimum gcc version to 5.1.
The previous problem mentioned in patch f02c69680088 is not existed. So we
can now revert to use hotplug_memory_notifier() directly rather than
register_hotmemory_notifier().

Signed-off-by: Liu Shixin <liushixin2@huawei.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
---
 kernel/cgroup/cpuset.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index b474289c15b8..0c6db6a4f427 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -3630,11 +3630,6 @@ static int cpuset_track_online_nodes(struct notifier_block *self,
 	return NOTIFY_OK;
 }
 
-static struct notifier_block cpuset_track_online_nodes_nb = {
-	.notifier_call = cpuset_track_online_nodes,
-	.priority = 10,		/* ??! */
-};
-
 /**
  * cpuset_init_smp - initialize cpus_allowed
  *
@@ -3652,7 +3647,7 @@ void __init cpuset_init_smp(void)
 	cpumask_copy(top_cpuset.effective_cpus, cpu_active_mask);
 	top_cpuset.effective_mems = node_states[N_MEMORY];
 
-	register_hotmemory_notifier(&cpuset_track_online_nodes_nb);
+	hotplug_memory_notifier(cpuset_track_online_nodes, 10);
 
 	cpuset_migrate_mm_wq = alloc_ordered_workqueue("cpuset_migrate_mm", 0);
 	BUG_ON(!cpuset_migrate_mm_wq);
-- 
2.25.1

On Fri, 23 Sep 2022 11:33:40 +0800 Liu Shixin <liushixin2@huawei.com> wrote:

> Since patch 316346243be6 

That's a merge commit.  I'll rewrite this to 76ae847497bc52
("Documentation: raise minimum supported version of GCC to 5.1"). 
Which, although misnamed is the commit which made the change.

> has already updated the minimum gcc version to 5.1.
> The previous problem mentioned in patch f02c69680088

I'll make that f02c69680088 ("include/linux/memory.h: implement
register_hotmemory_notifier()").

And hot damn I write good changelogs!  Wrote :(

> is not existed. So we
> can now revert to use hotplug_memory_notifier() directly rather than
> register_hotmemory_notifier().

I redid the changelogs thusly:

: 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().