projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dc6bbc9)
msm: iommu: Use the correct memory allocation flag
authorStepan Moskovchenko <stepanm@codeaurora.org>
Fri, 10 Dec 2010 22:12:03 +0000 (14:12 -0800)
committerDavid Brown <davidb@codeaurora.org>
Wed, 15 Dec 2010 22:09:59 +0000 (14:09 -0800)
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>
arch/arm/mach-msm/iommu.c patch | blob | blame | history

diff --git a/arch/arm/mach-msm/iommu.c b/arch/arm/mach-msm/iommu.c
index f65101742a742118985b843f4a0fe7dcba90d629..e2d58e4cb0d73c47ecb11f62d834114d5e186d41 100644 (file)
--- 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) {