x86: add tizen_qemu_x86_defconfig & tizen_qemu_x86_64_defconfig

[platform/kernel/linux-rpi.git] / mm / memblock.c

diff --git a/mm/memblock.c b/mm/memblock.c
index 5096500..838d59a 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -366,14 +366,20 @@ void __init memblock_discard(void)
                addr = __pa(memblock.reserved.regions);
                size = PAGE_ALIGN(sizeof(struct memblock_region) *
                                  memblock.reserved.max);
-               __memblock_free_late(addr, size);
+               if (memblock_reserved_in_slab)
+                       kfree(memblock.reserved.regions);
+               else
+                       __memblock_free_late(addr, size);
        }
 
        if (memblock.memory.regions != memblock_memory_init_regions) {
                addr = __pa(memblock.memory.regions);
                size = PAGE_ALIGN(sizeof(struct memblock_region) *
                                  memblock.memory.max);
-               __memblock_free_late(addr, size);
+               if (memblock_memory_in_slab)
+                       kfree(memblock.memory.regions);
+               else
+                       __memblock_free_late(addr, size);
        }
 
        memblock_memory = NULL;
@@ -1609,7 +1615,13 @@ void __init __memblock_free_late(phys_addr_t base, phys_addr_t size)
        end = PFN_DOWN(base + size);
 
        for (; cursor < end; cursor++) {
-               memblock_free_pages(pfn_to_page(cursor), cursor, 0);
+               /*
+                * Reserved pages are always initialized by the end of
+                * memblock_free_all() (by memmap_init() and, if deferred
+                * initialization is enabled, memmap_init_reserved_pages()), so
+                * these pages can be released directly to the buddy allocator.
+                */
+               __free_pages_core(pfn_to_page(cursor), 0);
                totalram_pages_inc();
        }
 }