git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
iommu.c
diff --git
a/arch/arm/mach-msm/iommu.c
b/arch/arm/mach-msm/iommu.c
index
f651017
..
e2d58e4
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) {