1 files changed, 7 insertions, 6 deletions

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index dc00a1331ace..3c43109ba054 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -77,10 +77,14 @@ void __init dma32_reserve_bootmem(void)
         if (end_pfn <= MAX_DMA32_PFN)
                 return;
 
+        /*
+         * check aperture_64.c allocate_aperture() for reason about
+         * using 512M as goal
+         */
         align = 64ULL<<20;
         size = round_up(dma32_bootmem_size, align);
         dma32_bootmem_ptr = __alloc_bootmem_nopanic(size, align,
-                                 __pa(MAX_DMA_ADDRESS));
+                                 512ULL<<20);
         if (dma32_bootmem_ptr)
                 dma32_bootmem_size = size;
         else
@@ -88,7 +92,6 @@ void __init dma32_reserve_bootmem(void)
 }
 static void __init dma32_free_bootmem(void)
 {
-        int node;
 
         if (end_pfn <= MAX_DMA32_PFN)
                 return;
@@ -96,9 +99,7 @@ static void __init dma32_free_bootmem(void)
         if (!dma32_bootmem_ptr)
                 return;
 
-        for_each_online_node(node)
-                free_bootmem_node(NODE_DATA(node), __pa(dma32_bootmem_ptr),
-                                  dma32_bootmem_size);
+        free_bootmem(__pa(dma32_bootmem_ptr), dma32_bootmem_size);
 
         dma32_bootmem_ptr = NULL;
         dma32_bootmem_size = 0;
@@ -357,7 +358,7 @@ int dma_supported(struct device *dev, u64 mask)
 EXPORT_SYMBOL(dma_supported);
 
 /* Allocate DMA memory on node near device */
-noinline struct page *
+static noinline struct page *
 dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order)
 {
         int node;