Merge tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd

[~andy/linux] / lib / swiotlb.c

diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 2e1c102759ce7a18f9a988b54c14c0b4c154d0bb..b604b831f4d182c4cbc43ddcb23e7f98d3d8d177 100644 (file)
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -172,7 +172,7 @@ int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
        /*
         * Get the overflow emergency buffer
         */
-       v_overflow_buffer = memblock_virt_alloc_nopanic(
+       v_overflow_buffer = memblock_virt_alloc_low_nopanic(
                                                PAGE_ALIGN(io_tlb_overflow),
                                                PAGE_SIZE);
        if (!v_overflow_buffer)
@@ -220,7 +220,7 @@ swiotlb_init(int verbose)
        bytes = io_tlb_nslabs << IO_TLB_SHIFT;
 
        /* Get IO TLB memory from the low pages */
-       vstart = memblock_virt_alloc_nopanic(PAGE_ALIGN(bytes), PAGE_SIZE);
+       vstart = memblock_virt_alloc_low_nopanic(PAGE_ALIGN(bytes), PAGE_SIZE);
        if (vstart && !swiotlb_init_with_tbl(vstart, io_tlb_nslabs, verbose))
                return;