Messages in this thread Patch in this message | | | Date | Wed, 2 Mar 2011 16:29:35 -0600 | From | David Engel <> | Subject | Re: Linux 2.6.32.30 |
| |
On Wed, Mar 02, 2011 at 03:42:02PM -0500, Greg KH wrote: > On Wed, Mar 02, 2011 at 05:50:16PM +0100, Stefan Bader wrote: > > > FUJITA Tomonori (1): > > > swiotlb: fix wrong panic > > > > > > > This one breaks compilation of 64bit for me as swiotlb_tbl_unmap_single() does > > not exist. It does not look like it is a simple single patch that would get it > > back to 2.6.32. > > I don't understand. Is this patch somehow broken? Is there an > additional patch I need to apply to fix the build issue? I need more > information here.
I think this will fix it.
Fix compilation error introduced in 484d82b6.
do_unmap_single() was renamed to swiotlb_tbl_unmap_single() in bfc5501f. Use the old name unless/until that change is also backported.
Signed-off-by: David Engel <david@istwok.net>
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 7740ee8..0d0df11 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -632,7 +632,7 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, * Ensure that the address returned is DMA'ble */ if (!dma_capable(dev, dev_addr, size)) { - swiotlb_tbl_unmap_single(dev, map, size, dir); + do_unmap_single(dev, map, size, dir); dev_addr = swiotlb_virt_to_bus(dev, io_tlb_overflow_buffer); } David -- David Engel david@istwok.net
| |