]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
mm-cma-allocate-cma-areas-bottom-up-fix
authorRoman Gushchin <guro@fb.com>
Thu, 31 Dec 2020 22:04:26 +0000 (22:04 +0000)
committerJohannes Weiner <hannes@cmpxchg.org>
Thu, 31 Dec 2020 22:04:26 +0000 (22:04 +0000)
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>
mm/cma.c

index ff2754dfbf76e2bad3a1b7efc2707ffefc185007..4fe74c9d83b06c19aa198957de54db5a03de250d 100644 (file)
--- 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);