lkml.org 
[lkml]   [2011]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: Linux 2.6.32.31
    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;
    }

    \
     
     \ /
      Last update: 2011-03-03 18:07    [W:0.019 / U:39.352 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site