---

yaml --- r: 225692 b: refs/heads/master c: 294b2de h: refs/heads/master v: v3
git-mirror · Dec 15, 2010 · 85d7a1a · 85d7a1a
1 parent 8e86aac
commit 85d7a1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc6bbc991b0c408daad5df43e5851f1d369e50f7
+refs/heads/master: 294b2dea83ba0a6d6034a7521bc62c317efab17b
diff --git a/trunk/arch/arm/mach-msm/iommu.c b/trunk/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) {