The patch titled
Subject: mm-cma-allocate-cma-areas-bottom-up-fix-2
has been removed from the -mm tree. Its filename was
mm-cma-allocate-cma-areas-bottom-up-fix-2.patch
This patch was dropped because it was folded into mm-cma-allocate-cma-areas-bottom-up.patch
------------------------------------------------------
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-cma-allocate-cma-areas-bottom-up.patch
mm-cma-allocate-cma-areas-bottom-up-fix-3.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
