[kernel] r16965 - dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable

[Maximilian Attems]

Author: maks
Date: Wed Mar  2 16:05:43 2011
New Revision: 16965

Log:
add the released 2.6.32.30

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.30.patch
      - copied, changed from r16963, dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.30-rc1.patch
Deleted:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.30-rc1.patch

Copied and modified: dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.30.patch (from r16963, dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.30-rc1.patch)
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.30-rc1.patch	Wed Mar  2 03:48:03 2011	(r16963, copy source)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.30.patch	Wed Mar  2 16:05:43 2011	(r16965)
@@ -2844,6 +2844,23 @@
  }
  
  asmlinkage int swsusp_save(void)
+diff --git a/lib/swiotlb.c b/lib/swiotlb.c
+index ac25cd2..7740ee8 100644
+--- a/lib/swiotlb.c
++++ b/lib/swiotlb.c
+@@ -631,8 +631,10 @@ 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))
+-		panic("map_single: bounce buffer is not DMA'ble");
++	if (!dma_capable(dev, dev_addr, size)) {
++		swiotlb_tbl_unmap_single(dev, map, size, dir);
++		dev_addr = swiotlb_virt_to_bus(dev, io_tlb_overflow_buffer);
++	}
+ 
+ 	return dev_addr;
+ }
 diff --git a/net/core/filter.c b/net/core/filter.c
 index d1d779c..0127397 100644
 --- a/net/core/filter.c
@@ -3102,14 +3119,19 @@
  	han->cd = cd;
  	return 0;
 diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c
-index e4e1b6e..8954783 100644
+index e4e1b6e..3f1816a 100644
 --- a/net/x25/x25_link.c
 +++ b/net/x25/x25_link.c
-@@ -393,6 +393,7 @@ void __exit x25_link_free(void)
+@@ -391,8 +391,12 @@ void __exit x25_link_free(void)
+ 	write_lock_bh(&x25_neigh_list_lock);
+ 
  	list_for_each_safe(entry, tmp, &x25_neigh_list) {
++		struct net_device *dev;
++
  		nb = list_entry(entry, struct x25_neigh, node);
++		dev = nb->dev;
  		__x25_remove_neigh(nb);
-+		dev_put(nb->dev);
++		dev_put(dev);
  	}
  	write_unlock_bh(&x25_neigh_list_lock);
  }