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

Commit 294b2dea authored by Stepan Moskovchenko's avatar Stepan Moskovchenko Committed by David Brown
Browse files

msm: iommu: Use the correct memory allocation flag 



Change msm_iommu_map to use GFP_ATOMIC instead of
GFP_KERNEL due to the fact that the call occurs within
a spinlock-protected region.

Signed-off-by: default avatarStepan Moskovchenko <stepanm@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent dc6bbc99

arch/arm/mach-msm/iommu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -386,7 +386,7 @@ static int msm_iommu_map(struct iommu_domain *domain, unsigned long va, 
	/* Need a 2nd level table */

	/* Need a 2nd level table */

	if ((len == SZ_4K || len == SZ_64K) && (*fl_pte) == 0) {

	if ((len == SZ_4K || len == SZ_64K) && (*fl_pte) == 0) {

		unsigned long *sl;

		unsigned long *sl;

		sl = (unsigned long *) __get_free_pages(GFP_KERNEL,

		sl = (unsigned long *) __get_free_pages(GFP_ATOMIC,

							get_order(SZ_4K));

							get_order(SZ_4K));





		if (!sl) {

		if (!sl) {