diff options
| author | Linus Torvalds <[email protected]> | 2013-12-02 18:12:01 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2013-12-02 18:12:01 +0000 |
| commit | bcc2f9b718d0be9cd77551d37c28daf4ebbc570c (patch) | |
| tree | 5debda8b953b288bd547d2be8e36046746762fb0 /drivers/xen/swiotlb-xen.c | |
| parent | Merge tag 'spi-v3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff) | |
| parent | xen/gnttab: leave lazy MMU mode in the case of a m2p override failure (diff) | |
| download | kernel-bcc2f9b718d0be9cd77551d37c28daf4ebbc570c.tar.gz kernel-bcc2f9b718d0be9cd77551d37c28daf4ebbc570c.zip | |
Merge tag 'stable/for-linus-3.13-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
"Fixes to patches that went in this merge window along with a latent
bug:
- Fix lazy flushing in case m2p override fails.
- Fix module compile issues with ARM/Xen
- Add missing call to DMA map page for Xen SWIOTLB for ARM"
* tag 'stable/for-linus-3.13-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/gnttab: leave lazy MMU mode in the case of a m2p override failure
xen/arm: p2m_init and p2m_lock should be static
arm/xen: Export phys_to_mach to fix Xen module link errors
swiotlb-xen: add missing xen_dma_map_page call
Diffstat (limited to 'drivers/xen/swiotlb-xen.c')
| -rw-r--r-- | drivers/xen/swiotlb-xen.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index a224bc74b6b9..1eac0731c349 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -555,6 +555,11 @@ xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, sg_dma_len(sgl) = 0; return 0; } + xen_dma_map_page(hwdev, pfn_to_page(map >> PAGE_SHIFT), + map & ~PAGE_MASK, + sg->length, + dir, + attrs); sg->dma_address = xen_phys_to_bus(map); } else { /* we are not interested in the dma_addr returned by |