aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-13 16:35:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-13 16:35:05 -0700
commit70813196581fc636cb8a49e9bba9e04bda76206e (patch)
tree862f24526ba6ec0e7a9ebfe46100246f8a41b72a
parenta56f31a0c6a08faeca5f0c5e64c6a0113c43181b (diff)
parent0fa035e52373386381fcdfbd506e32eac0c662f0 (diff)
downloadmrst-s0i3-test-70813196581fc636cb8a49e9bba9e04bda76206e.tar.gz
mrst-s0i3-test-70813196581fc636cb8a49e9bba9e04bda76206e.tar.xz
mrst-s0i3-test-70813196581fc636cb8a49e9bba9e04bda76206e.zip
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: omap: iommu-load cam register before flushing the entry
-rw-r--r--arch/arm/plat-omap/iommu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/iommu.c b/arch/arm/plat-omap/iommu.c
index a202a2ce6e3..6cd151b31bc 100644
--- a/arch/arm/plat-omap/iommu.c
+++ b/arch/arm/plat-omap/iommu.c
@@ -320,6 +320,7 @@ void flush_iotlb_page(struct iommu *obj, u32 da)
if ((start <= da) && (da < start + bytes)) {
dev_dbg(obj->dev, "%s: %08x<=%08x(%x)\n",
__func__, start, da, bytes);
+ iotlb_load_cr(obj, &cr);
iommu_write_reg(obj, 1, MMU_FLUSH_ENTRY);
}
}