[to-be-updated] mm-memory_hotplug-memory-group-aware-auto-movable-online-policy-fix.patch removed from -mm tree

[to-be-updated] mm-memory_hotplug-memory-group-aware-auto-movable-online-policy-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm-memory_hotplug-memory-group-aware-auto-movable-online-policy-fix
has been removed from the -mm tree.  Its filename was
     mm-memory_hotplug-memory-group-aware-auto-movable-online-policy-fix.patch

This patch was dropped because an updated version will be merged

------------------------------------------------------
From: David Hildenbrand <david@redhat.com>
Subject: mm-memory_hotplug-memory-group-aware-auto-movable-online-policy-fix

fix warning

> ../mm/memory_hotplug.c: In function `auto_movable_stats_account_zone':
> ../mm/memory_hotplug.c:748:33: error: `struct zone' has no member named `cma_pages'; did you mean `managed_pages'?
>     stats->movable_pages += zone->cma_pages;
>                                   ^~~~~~~~~
>                                   managed_pages
> ../mm/memory_hotplug.c:750:38: error: `struct zone' has no member named `cma_pages'; did you mean `managed_pages'?
>     stats->kernel_early_pages -= zone->cma_pages;
>                                        ^~~~~~~~~
>                                        managed_pages
>
>

Link: https://lkml.kernel.org/r/5394da5e-29f0-ff7d-e614-e2805400a8bb@redhat.com
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/memory_hotplug.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/mm/memory_hotplug.c~mm-memory_hotplug-memory-group-aware-auto-movable-online-policy-fix
+++ a/mm/memory_hotplug.c
@@ -741,13 +741,15 @@ static void auto_movable_stats_account_z
 	if (zone_idx(zone) == ZONE_MOVABLE) {
 		stats->movable_pages += zone->present_pages;
 	} else {
+		stats->kernel_early_pages += zone->present_early_pages;
+#ifdef CONFIG_CMA
 		/*
 		 * CMA pages (never on hotplugged memory) behave like
 		 * ZONE_MOVABLE.
 		 */
 		stats->movable_pages += zone->cma_pages;
-		stats->kernel_early_pages += zone->present_early_pages;
 		stats->kernel_early_pages -= zone->cma_pages;
+#endif /* CONFIG_CMA */
 	}
 }
 
_

Patches currently in -mm which might be from david@redhat.com are

mm-madvise-report-sigbus-as-efault-for-madv_populate_readwrite.patch
memory-hotplugrst-remove-locking-details-from-admin-guide.patch
memory-hotplugrst-complete-admin-guide-overhaul.patch
mm-memory_hotplug-use-unsigned-long-for-pfn-in-zone_for_pfn_range.patch
mm-memory_hotplug-remove-nid-parameter-from-arch_remove_memory.patch
mm-memory_hotplug-remove-nid-parameter-from-remove_memory-and-friends.patch
acpi-memhotplug-memory-resources-cannot-be-enabled-yet.patch
mm-memory_hotplug-improved-dynamic-memory-group-aware-auto-movable-online-policy.patch