Merge branch 'akpm-current/current'

[deliverable/linux.git] / arch / x86 / kernel / e820.c

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 871f1863457dccdf2fdcdf310aae774ab1b3c9d2..a1b4da92921c75b053399880e5bcd0e9ce071e4e 100644 (file)
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -1188,6 +1188,6 @@ void __init memblock_find_dma_reserve(void)
                        nr_free_pages += end_pfn - start_pfn;
        }
 
-       set_dma_reserve(nr_pages - nr_free_pages);
+       set_memory_reserve(nr_pages - nr_free_pages, false);
 #endif
 }