[folded-merged] mm-memory_hotplug-reset-nodes-state-when-empty-during-offline-fix.patch removed from -mm tree

[folded-merged] mm-memory_hotplug-reset-nodes-state-when-empty-during-offline-fix.patch removed from -mm tree

[Andrew Morton]

The patch titled
     Subject: mm/memory_hotplug: fix build warning without CONFIG_MEMORY_HOTREMOVE
has been removed from the -mm tree.  Its filename was
     mm-memory_hotplug-reset-nodes-state-when-empty-during-offline-fix.patch

This patch was dropped because it was folded into mm-memory_hotplug-reset-nodes-state-when-empty-during-offline.patch

------------------------------------------------------
From: YueHaibing <yuehaibing@huawei.com>
Subject: mm/memory_hotplug: fix build warning without CONFIG_MEMORY_HOTREMOVE

mm/memory_hotplug.c:1148:13: warning: `reset_node_present_pages' defined but not used [-Wunused-function]
 1148 | static void reset_node_present_pages(pg_data_t *pgdat)
      |             ^~~~~~~~~~~~~~~~~~~~~~~~

reset_node_present_pages() now only used in node_reset_state(),move it
inside the ifdef block to fix this warning.

Link: https://lkml.kernel.org/r/20220408022402.29668-1-yuehaibing@huawei.com
Fixes: 0d540af7befe ("mm/memory_hotplug: reset node's state when empty during offline")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: David Hildenbrand <david@redhat.com>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Wei Yang <richard.weiyang@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/memory_hotplug.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- a/mm/memory_hotplug.c~mm-memory_hotplug-reset-nodes-state-when-empty-during-offline-fix
+++ a/mm/memory_hotplug.c
@@ -1146,16 +1146,6 @@ failed_addition:
 	return ret;
 }
 
-static void reset_node_present_pages(pg_data_t *pgdat)
-{
-	struct zone *z;
-
-	for (z = pgdat->node_zones; z < pgdat->node_zones + MAX_NR_ZONES; z++)
-		z->present_pages = 0;
-
-	pgdat->node_present_pages = 0;
-}
-
 /* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */
 static pg_data_t __ref *hotadd_init_pgdat(int nid)
 {
@@ -1756,6 +1746,16 @@ static void node_states_clear_node(int n
 		node_clear_state(node, N_MEMORY);
 }
 
+static void reset_node_present_pages(pg_data_t *pgdat)
+{
+	struct zone *z;
+
+	for (z = pgdat->node_zones; z < pgdat->node_zones + MAX_NR_ZONES; z++)
+		z->present_pages = 0;
+
+	pgdat->node_present_pages = 0;
+}
+
 static void node_reset_state(int node)
 {
 	pg_data_t *pgdat = NODE_DATA(node);
_

Patches currently in -mm which might be from yuehaibing@huawei.com are

mm-memory_hotplug-reset-nodes-state-when-empty-during-offline.patch