The patch titled
Subject: mm-memory_hotplug-memory-group-aware-auto-movable-online-policy-fix
has been added to the -mm tree. Its filename is
mm-memory_hotplug-memory-group-aware-auto-movable-online-policy-fix.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-memory_hotplug-memory-group-aware-auto-movable-online-policy-fix.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-memory_hotplug-memory-group-aware-auto-movable-online-policy-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: David Hildenbrand <david@xxxxxxxxxx>
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@xxxxxxxxxx
Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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@xxxxxxxxxx are
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-track-present-early-pages-per-zone.patch
mm-memory_hotplug-introduce-auto-movable-online-policy.patch
drivers-base-memory-introduce-memory-groups-to-logically-group-memory-blocks.patch
mm-memory_hotplug-track-present-pages-in-memory-groups.patch
acpi-memhotplug-use-a-single-static-memory-group-for-a-single-memory-device.patch
dax-kmem-use-a-single-static-memory-group-for-a-single-probed-unit.patch
virtio-mem-use-a-single-dynamic-memory-group-for-a-single-virtio-mem-device.patch
mm-memory_hotplug-memory-group-aware-auto-movable-online-policy.patch
mm-memory_hotplug-memory-group-aware-auto-movable-online-policy-fix.patch
mm-memory_hotplug-improved-dynamic-memory-group-aware-auto-movable-online-policy.patch
