Linux 2.6.32.31

Linux 2.6.32.31

[Greg KH]

I'm announcing the release of the 2.6.32.31 kernel.

All users of the 2.6.32 kernel series must upgrade.

It only contains one patch, a revert of a patch that broke the build on
a number of systems and should have never been included in the .32 tree.
This was my fault, I had it reverted in my local development machine,
but forgot to sync it up to my laptop which I took with me this week
while traveling to a Linux Foundation conference, where I did the final
release.

Sorry for any problems this might have caused.

The updated 2.6.32.y git tree can be found at:
        git://git.kernel.org/pub/scm/linux/kernel/git/longterm/linux-2.6.32.y.git
and can be browsed at the normal kernel.org git web browser:
        http://git.kernel.org/?p=linux/kernel/git/longterm/linux-2.6.32.y.git;a=summary

thanks,

greg k-h

------------

 Makefile      |    2 +-
 lib/swiotlb.c |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

Greg Kroah-Hartman (2):
      Revert "swiotlb: fix wrong panic"
      Linux 2.6.32.31

Re: Linux 2.6.32.31

[Greg KH]

diff --git a/Makefile b/Makefile
index 1e5c60f..e734450 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 32
-EXTRAVERSION = .30
+EXTRAVERSION = .31
 NAME = Man-Eating Seals of Antiquity
 
 # *DOCUMENTATION*
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 7740ee8..ac25cd2 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -631,10 +631,8 @@ 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);
-		dev_addr = swiotlb_virt_to_bus(dev, io_tlb_overflow_buffer);
-	}
+	if (!dma_capable(dev, dev_addr, size))
+		panic("map_single: bounce buffer is not DMA'ble");
 
 	return dev_addr;
 }