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 'btrfs-3.0' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
iommu2.c
diff --git
a/arch/arm/mach-omap2/iommu2.c
b/arch/arm/mach-omap2/iommu2.c
index
adb083e
..
f286012
100644
(file)
--- a/
arch/arm/mach-omap2/iommu2.c
+++ b/
arch/arm/mach-omap2/iommu2.c
@@
-225,8
+225,8
@@
static u32 omap2_get_pte_attr(struct iotlb_entry *e)
attr = e->mixed << 5;
attr |= e->endian;
attr |= e->elsz >> 3;
- attr <<= ((
e->pgsz & MMU_CAM_PGSZ_4K) ? 0 : 6);
-
+ attr <<= ((
(e->pgsz == MMU_CAM_PGSZ_4K) ||
+ (e->pgsz == MMU_CAM_PGSZ_64K)) ? 0 : 6);
return attr;
}