diff options
| author | Stepan Moskovchenko <stepanm@codeaurora.org> | 2010-12-10 14:12:03 -0800 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2010-12-15 14:09:59 -0800 |
| commit | 294b2dea83ba0a6d6034a7521bc62c317efab17b (patch) | |
| tree | b2613c5564ea7dc49f5a33cdb6242fdd40f1fc85 /arch/arm/mach-msm/iommu.c | |
| parent | dc6bbc991b0c408daad5df43e5851f1d369e50f7 (diff) | |
| download | op-kernel-dev-294b2dea83ba0a6d6034a7521bc62c317efab17b.zip op-kernel-dev-294b2dea83ba0a6d6034a7521bc62c317efab17b.tar.gz | |
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 <stepanm@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/iommu.c')
| -rw-r--r-- | arch/arm/mach-msm/iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/iommu.c b/arch/arm/mach-msm/iommu.c index f651017..e2d58e4 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) { |
