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 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
iommu.c
diff --git
a/arch/arm/plat-omap/iommu.c
b/arch/arm/plat-omap/iommu.c
index
a202a2c
..
6cd151b
100644
(file)
--- 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);
}
}