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

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

Merge "ion: Correct argument of Set/ClearPagePrivate of secure CMA"

parents 5f542125 c8fb15a4

drivers/staging/android/ion/ion_cma_heap.c

+2 −2
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static void ion_secure_cma_free(struct ion_buffer *buffer) 
	}



	for_each_sg(sgt->sgl, sg, sgt->nents, i)

		ClearPagePrivate(sg_page(sgt->sgl));

		ClearPagePrivate(sg_page(sg));



	ion_cma_free(buffer);

out_free_source:
@@ -345,7 +345,7 @@ static int ion_secure_cma_allocate( 


	/* Set the private bit to indicate that we've secured this */

	for_each_sg(sgt->sgl, sg, sgt->nents, i)

		SetPagePrivate(sg_page(sgt->sgl));

		SetPagePrivate(sg_page(sg));



	kfree(dest_vm_list);

	kfree(dest_perms);