* [folded-merged] mm-cma-allocate-cma-areas-bottom-up-fix-3-fix.patch removed from -mm tree
@ 2021-02-26 0:39 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2021-02-26 0:39 UTC (permalink / raw)
To: akpm, guro, mm-commits, rdunlap, rppt, sfr
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@linux-foundation.org>
Subject: mm-cma-allocate-cma-areas-bottom-up-fix-3-fix
build fix
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Roman Gushchin <guro@fb.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
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@linux-foundation.org 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-02-26 0:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-26 0:39 [folded-merged] mm-cma-allocate-cma-areas-bottom-up-fix-3-fix.patch removed from -mm tree akpm
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).