The patch titled
Subject: mm-cma-allocate-cma-areas-bottom-up-fix-2
has been added to the -mm tree. Its filename is
mm-cma-allocate-cma-areas-bottom-up-fix-2.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-cma-allocate-cma-areas-bottom-up-fix-2.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-cma-allocate-cma-areas-bottom-up-fix-2.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: Roman Gushchin <guro@xxxxxx>
Subject: mm-cma-allocate-cma-areas-bottom-up-fix-2
fix 32-bit warnings
Link: https://lkml.kernel.org/r/20201223163537.GA4011967@xxxxxxxxxxxxxxxxxxxxxxxxxxx
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/cma.c | 2 ++
1 file changed, 2 insertions(+)
--- a/mm/cma.c~mm-cma-allocate-cma-areas-bottom-up-fix-2
+++ a/mm/cma.c
@@ -344,12 +344,14 @@ int __init cma_declare_contiguous_nid(ph
* Avoid using first 4GB to not interfere with constrained zones
* like DMA/DMA32.
*/
+#if BITS_PER_LONG > 32
if (!memblock_bottom_up() && memblock_end >= SZ_4G + size) {
memblock_set_bottom_up(true);
addr = memblock_alloc_range_nid(size, alignment, SZ_4G,
limit, nid, true);
memblock_set_bottom_up(false);
}
+#endif
if (!addr) {
addr = memblock_alloc_range_nid(size, alignment, base,
_
Patches currently in -mm which might be from guro@xxxxxx are
mm-slub-call-account_slab_page-after-slab-page-initialization.patch
mm-memcg-slab-pre-allocate-obj_cgroups-for-slab-caches-with-slab_account.patch
mm-cma-allocate-cma-areas-bottom-up.patch
mm-cma-allocate-cma-areas-bottom-up-fix.patch
mm-cma-allocate-cma-areas-bottom-up-fix-2.patch
memblock-do-not-start-bottom-up-allocations-with-kernel_end.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix.patch
