The patch titled
Subject: mm-cma-allocate-cma-areas-bottom-up-fix-3
has been removed from the -mm tree. Its filename was
mm-cma-allocate-cma-areas-bottom-up-fix-3.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-3
> 32-bit systems can have more than 32 bit in the physical address.
> I think a better option would be to use CONFIG_PHYS_ADDR_T_64BIT
I agree. An updated fixup below.
Cc: Mike Rapoport <rppt@xxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/cma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/mm/cma.c~mm-cma-allocate-cma-areas-bottom-up-fix-3
+++ a/mm/cma.c
@@ -344,7 +344,7 @@ 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 CONFIG_PHYS_ADDR_T_64BIT
if (!memblock_bottom_up() && memblock_end >= SZ_4G + size) {
memblock_set_bottom_up(true);
addr = memblock_alloc_range_nid(size, alignment, SZ_4G,
_
Patches currently in -mm which might be from guro@xxxxxx are
mm-cma-allocate-cma-areas-bottom-up.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
