From 85d7a1ae8b9a03e76bcff33fb45b91e209a6298c Mon Sep 17 00:00:00 2001
From: Stepan Moskovchenko <stepanm@codeaurora.org>
Date: Fri, 10 Dec 2010 14:12:03 -0800
Subject: [PATCH] --- yaml --- r: 225692 b: refs/heads/master c:
 294b2dea83ba0a6d6034a7521bc62c317efab17b h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/mach-msm/iommu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ad1ba83192bc..d0f3d92225c8 100644
--- 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
index f65101742a74..e2d58e4cb0d7 100644
--- 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) {