The patch titled Subject: mm-cma-allocate-cma-areas-bottom-up-fix-3-fix has been removed from the -mm tree. Its filename was mm-cma-allocate-cma-areas-bottom-up-fix-3-fix.patch This patch was dropped because it was folded into mm-cma-allocate-cma-areas-bottom-up.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-cma-allocate-cma-areas-bottom-up-fix-3-fix build fix Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Cc: Mike Rapoport <rppt@xxxxxxxxxx> Cc: Roman Gushchin <guro@xxxxxx> 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-fix +++ 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 CONFIG_PHYS_ADDR_T_64BIT +#ifdef 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 akpm@xxxxxxxxxxxxxxxxxxxx are mm-cma-allocate-cma-areas-bottom-up.patch mm-memory_hotplug-prevalidate-the-address-range-being-added-with-platform-fix.patch bdi-use-might_alloc-fix.patch kfence-kasan-make-kfence-compatible-with-kasan-fix.patch lib-stackdepot-add-support-to-disable-stack-depot-fix.patch seq_file-document-how-per-entry-resources-are-managed-fix.patch initramfs-panic-with-memory-information-fix.patch mm-page_allocc-refactor-initialization-of-struct-page-for-holes-in-memory-layout-fix.patch mm.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch linux-next-rejects.patch linux-next-git-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch