diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-17 13:35:41 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-17 13:35:41 -0700 |
| commit | e2360d3dc511894e4d7f0a02727244be8903ba9d (patch) | |
| tree | e59f7343d1b813139cf0a66810838c422cdf12f3 | |
| parent | c82afbe4fc8b287196a381e056cc925caa759505 (diff) | |
| download | longterm-queue-2.6.33-e2360d3dc511894e4d7f0a02727244be8903ba9d.tar.gz | |
another broken patch removed
| -rw-r--r-- | queue-2.6.33/series | 1 | ||||
| -rw-r--r-- | queue-2.6.33/swiotlb-fix-wrong-panic.patch | 46 |
2 files changed, 0 insertions, 47 deletions
diff --git a/queue-2.6.33/series b/queue-2.6.33/series index 1bc3184..d0b5a5a 100644 --- a/queue-2.6.33/series +++ b/queue-2.6.33/series @@ -383,7 +383,6 @@ staging-usbip-vhci-give-back-urbs-from-in-flight-unlink-requests.patch staging-usbip-vhci-refuse-to-enqueue-for-dead-connections.patch staging-usbip-vhci-use-urb-dev-portnum-to-find-port.patch epoll-prevent-creating-circular-epoll-structures.patch -swiotlb-fix-wrong-panic.patch ldm-corrupted-partition-table-can-cause-kernel-oops.patch md-correctly-handle-probe-of-an-mdp-device.patch x86-quirk-fix-polarity-for-irq0-pin2-override-on-sb800-systems.patch diff --git a/queue-2.6.33/swiotlb-fix-wrong-panic.patch b/queue-2.6.33/swiotlb-fix-wrong-panic.patch deleted file mode 100644 index 04c59f9..0000000 --- a/queue-2.6.33/swiotlb-fix-wrong-panic.patch +++ /dev/null @@ -1,46 +0,0 @@ -From fba99fa38b023224680308a482e12a0eca87e4e1 Mon Sep 17 00:00:00 2001 -From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> -Date: Fri, 25 Feb 2011 14:44:16 -0800 -Subject: swiotlb: fix wrong panic - -From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> - -commit fba99fa38b023224680308a482e12a0eca87e4e1 upstream. - -swiotlb's map_page wrongly calls panic() when it can't find a buffer fit -for device's dma mask. It should return an error instead. - -Devices with an odd dma mask (i.e. under 4G) like b44 network card hit -this bug (the system crashes): - - http://marc.info/?l=linux-kernel&m=129648943830106&w=2 - -If swiotlb returns an error, b44 driver can use the own bouncing -mechanism. - -Reported-by: Chuck Ebbert <cebbert@redhat.com> -Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> -Tested-by: Arkadiusz Miskiewicz <arekm@maven.pl> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - lib/swiotlb.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - ---- a/lib/swiotlb.c -+++ b/lib/swiotlb.c -@@ -663,8 +663,10 @@ dma_addr_t swiotlb_map_page(struct devic - /* - * 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; - } |