From: Roman Gushchin <guro@fb.com>
Date: Thu, 31 Dec 2020 22:04:26 +0000 (+0000)
Subject: mm-cma-allocate-cma-areas-bottom-up-fix
X-Git-Tag: howlett/maple_spf/20210104~126
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f4951e7d2e35fb3d8b34b6e363008c38bf73447b;p=users%2Fjedix%2Flinux-maple.git

mm-cma-allocate-cma-areas-bottom-up-fix

whitespace fix, per Mike

Link: https://lkml.kernel.org/r/20201221170551.GB3428478@carbon.DHCP.thefacebook.com
Signed-off-by: Roman Gushchin <guro@fb.com>
Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Rik van Riel <riel@surriel.com>
Cc: Wonhyuk Yang <vvghjk1234@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/cma.c b/mm/cma.c
index ff2754dfbf76..4fe74c9d83b0 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -344,8 +344,7 @@ int __init cma_declare_contiguous_nid(phys_addr_t base,
 		 * Avoid using first 4GB to not interfere with constrained zones
 		 * like DMA/DMA32.
 		 */
-		if (!memblock_bottom_up() &&
-		    memblock_end >= SZ_4G + size) {
+		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);