Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
xtensa: fix sg->page fallout
Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
authored by Emil Medve and committed by Jens Axboe 891039a9 4e017764
+5
-8
include/asm-xtensa/dma-mapping.h
+5
-8
include/asm-xtensa/dma-mapping.h
···
58
58
BUG_ON(direction == DMA_NONE);
59
59
60
60
for (i = 0; i < nents; i++, sg++ ) {
61
-
BUG_ON(!sg->page);
61
+
BUG_ON(!sg_page(sg));
62
62
63
-
sg->dma_address = page_to_phys(sg->page) + sg->offset;
64
-
consistent_sync(page_address(sg->page) + sg->offset,
65
-
sg->length, direction);
63
+
sg->dma_address = sg_phys(sg);
64
+
consistent_sync(sg_virt(sg), sg->length, direction);
66
65
}
67
66
68
67
return nents;
···
127
128
{
128
129
int i;
129
130
for (i = 0; i < nelems; i++, sg++)
130
-
consistent_sync(page_address(sg->page) + sg->offset,
131
-
sg->length, dir);
131
+
consistent_sync(sg_virt(sg), sg->length, dir);
132
132
}
133
133
134
134
static inline void
···
136
138
{
137
139
int i;
138
140
for (i = 0; i < nelems; i++, sg++)
139
-
consistent_sync(page_address(sg->page) + sg->offset,
140
-
sg->length, dir);
141
+
consistent_sync(sg_virt(sg), sg->length, dir);
141
142
}
142
143
static inline int
143
144
dma_mapping_error(dma_addr_t dma_addr)