Commit 70813196 authored Oct 13, 2010 by Linus Torvalds

Merge branch 'omap-fixes-for-linus' of...

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

parents a56f31a0 0fa035e5

arch/arm/plat-omap/iommu.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}