[kernel] r16970 - in dists/squeeze/linux-2.6/debian/patches: bugfix/all/stable series

[Maximilian Attems]

Author: maks
Date: Wed Mar  2 23:43:14 2011
New Revision: 16970

Log:
2.6.32.30 last minute change (after rc0) broke:

/media/data/mattems/src/linux-2.6-2.6.32/debian/build/source_amd64_none/lib/swiotlb.c: In function ‘swiotlb_map_page’:
/media/data/mattems/src/linux-2.6-2.6.32/debian/build/source_amd64_none/lib/swiotlb.c:635: error: implicit declaration of function ‘swiotlb_tbl_unmap_single’

add proposed fix.

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.30-fix.patch
Modified:
   dists/squeeze/linux-2.6/debian/patches/series/31

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.30-fix.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.30-fix.patch	Wed Mar  2 23:43:14 2011	(r16970)
@@ -0,0 +1,24 @@
+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 at 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);
+ 	}
+ 
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/31
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/31	Wed Mar  2 23:28:57 2011	(r16969)
+++ dists/squeeze/linux-2.6/debian/patches/series/31	Wed Mar  2 23:43:14 2011	(r16970)
@@ -42,4 +42,5 @@
 - bugfix/all/fix-pktcdvd-ioctl-dev_minor-range-check.patch
 - bugfix/x86/x86-pvclock-Zero-last_value-on-resume.patch
 + bugfix/all/stable/2.6.32.30.patch
++ bugfix/all/stable/2.6.32.30-fix.patch
 + bugfix/all/netxen-fix-set-mac-addr.patch