diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-20 12:36:59 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-20 12:36:59 -0400 |
| commit | c7e0c8535d73f8c5bf760926a2bd71c9840cf2ef (patch) | |
| tree | 1386b9352b7b78bf1cb985463ab3aea30cb4288c /arch/arm/mach-omap2/iommu2.c | |
| parent | dfee09c8acf18e84fe197bb5d821d1e4e02d020f (diff) | |
| parent | ef4669db0c9d5f06d5fd169fa461289723a93a91 (diff) | |
Merge remote-tracking branch 'arm-soc/for-next' into linaro-3.0
Diffstat (limited to 'arch/arm/mach-omap2/iommu2.c')
| -rw-r--r-- | arch/arm/mach-omap2/iommu2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/iommu2.c b/arch/arm/mach-omap2/iommu2.c index adb083e41ac..f286012783c 100644 --- 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; } |