Merge "gpu: ion: Don't recursively take secure chunk lock"

	if (!(sc->gfp_mask & __GFP_MOVABLE))

		return atomic_read(&sheap->total_pool_size);

	mutex_lock(&sheap->chunk_lock);

	/*

	 * Allocation path may invoke the shrinker. Proceeding any further

	 * would cause a deadlock in several places so don't shrink if that

	 * happens.

	 */

	if (!mutex_trylock(&sheap->chunk_lock))

		return -1;

	list_for_each_safe(entry, _n, &sheap->chunks) {

		struct ion_cma_alloc_chunk *chunk = container_of(entry,

					struct ion_cma_alloc_chunk, entry);