Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2342673 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: correct ALLOC_WMARK_MIN flag check for atomic allocations"

parents 79595244 40b5623b

mm/page_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -3628,7 +3628,7 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags, 
		 *  3) ALLOC_HARDER - Allow (__GFP_ATOMIC && !__GFP_NOMEMALLOC),

		 *			of the others.

		 */

		if (unlikely(!order && (alloc_flags & ALLOC_WMARK_MIN) &&

		if (unlikely(!order && !(alloc_flags & ALLOC_WMARK_MASK) &&

		     (alloc_flags & (ALLOC_HARDER | ALLOC_HIGH)))) {

			mark = zone->_watermark[WMARK_MIN];

		}