From: akpm@linux-foundation.org
To: mm-commits@vger.kernel.org, rdunlap@infradead.org, david@redhat.com
Subject: [to-be-updated] mm-memory_hotplug-memory-group-aware-auto-movable-online-policy-fix.patch removed from -mm tree
Date: Sat, 07 Aug 2021 12:13:43 -0700 [thread overview]
Message-ID: <20210807191343.KXgBc%akpm@linux-foundation.org> (raw)
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
reply other threads:[~2021-08-07 19:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210807191343.KXgBc%akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mm-commits@vger.kernel.org \
--cc=rdunlap@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).