diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:35:10 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:35:10 +0200 |
| commit | c33d4326b60a3aea5cd070a365043f488f81a3b0 (patch) | |
| tree | 22732738445e6293a15f5408945784d1c2fd7019 /arch/arm/mach-omap2/iommu2.c | |
| parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) | |
| parent | 1ad920556f32a5a127397ca461d1a1faaf22c4e0 (diff) | |
| download | talos-op-linux-c33d4326b60a3aea5cd070a365043f488f81a3b0.tar.gz talos-op-linux-c33d4326b60a3aea5cd070a365043f488f81a3b0.zip | |
Merge branch 'omap/board' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/board
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 adb083e41acd..f286012783c6 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; } |
