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

Commit c61a2f6a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: shrinker free pages even for unmovable page requests"

parents 8363bc8c 46f5b71b
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -378,13 +378,6 @@ static int ion_secure_cma_shrinker(struct shrinker *shrinker,
	if (nr_to_scan == 0)
		return atomic_read(&sheap->total_pool_size);

	/*
	 * CMA pages can only be used for movable allocation so don't free if
	 * the allocation isn't movable
	 */
	if (!(sc->gfp_mask & __GFP_MOVABLE))
		return atomic_read(&sheap->total_pool_size);

	/*
	 * Allocation path may invoke the shrinker. Proceeding any further
	 * would cause a deadlock in several places so don't shrink if that