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 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
iovmm.c
diff --git
a/arch/arm/plat-omap/iovmm.c
b/arch/arm/plat-omap/iovmm.c
index
83a37c5
..
c60737c
100644
(file)
--- a/
arch/arm/plat-omap/iovmm.c
+++ b/
arch/arm/plat-omap/iovmm.c
@@
-72,7
+72,7
@@
static size_t sgtable_len(const struct sg_table *sgt)
for_each_sg(sgt->sgl, sg, sgt->nents, i) {
size_t bytes;
for_each_sg(sgt->sgl, sg, sgt->nents, i) {
size_t bytes;
- bytes = sg
_dma_len(sg)
;
+ bytes = sg
->length
;
if (!iopgsz_ok(bytes)) {
pr_err("%s: sg[%d] not iommu pagesize(%x)\n",
if (!iopgsz_ok(bytes)) {
pr_err("%s: sg[%d] not iommu pagesize(%x)\n",
@@
-198,7
+198,7
@@
static void *vmap_sg(const struct sg_table *sgt)
int err;
pa = sg_phys(sg);
int err;
pa = sg_phys(sg);
- bytes = sg
_dma_len(sg)
;
+ bytes = sg
->length
;
BUG_ON(bytes != PAGE_SIZE);
BUG_ON(bytes != PAGE_SIZE);
@@
-476,7
+476,7
@@
static int map_iovm_area(struct iommu *obj, struct iovm_struct *new,
struct iotlb_entry e;
pa = sg_phys(sg);
struct iotlb_entry e;
pa = sg_phys(sg);
- bytes = sg
_dma_len(sg)
;
+ bytes = sg
->length
;
flags &= ~IOVMF_PGSZ_MASK;
pgsz = bytes_to_iopgsz(bytes);
flags &= ~IOVMF_PGSZ_MASK;
pgsz = bytes_to_iopgsz(bytes);