From 294b2dea83ba0a6d6034a7521bc62c317efab17b Mon Sep 17 00:00:00 2001 From: Stepan Moskovchenko Date: Fri, 10 Dec 2010 14:12:03 -0800 Subject: [PATCH] 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: Stepan Moskovchenko Signed-off-by: David Brown --- arch/arm/mach-msm/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-msm/iommu.c b/arch/arm/mach-msm/iommu.c index f65101742a74..e2d58e4cb0d7 100644 --- a/arch/arm/mach-msm/iommu.c +++ b/arch/arm/mach-msm/iommu.c @@ -386,7 +386,7 @@ static int msm_iommu_map(struct iommu_domain *domain, unsigned long va, /* Need a 2nd level table */ if ((len == SZ_4K || len == SZ_64K) && (*fl_pte) == 0) { unsigned long *sl; - sl = (unsigned long *) __get_free_pages(GFP_KERNEL, + sl = (unsigned long *) __get_free_pages(GFP_ATOMIC, get_order(SZ_4K)); if (!sl) { -- 2.20.1