From: Dhaval Giani <dhaval.giani@oracle.com>
Date: Thu, 13 Jul 2017 21:48:38 +0000 (-0400)
Subject: Revert "mm: meminit: only set page reserved in the memblock region"
X-Git-Tag: v4.1.12-106.0.20170720_1900~28
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d62127c972383d68f8980fccce54cefc922ef996;p=users%2Fjedix%2Flinux-maple.git

Revert "mm: meminit: only set page reserved in the memblock region"

This reverts commit 35d7de6449327c64ed82c3e2b8c071a7664e0b19.

Orabug: 26446232
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>
---

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 9de631b4ae73..3c56b36ebd9d 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1681,8 +1681,6 @@ extern void free_highmem_page(struct page *page);
 extern void adjust_managed_page_count(struct page *page, long count);
 extern void mem_init_print_info(const char *str);
 
-extern void reserve_bootmem_region(unsigned long start, unsigned long end);
-
 /* Free the reserved page into the buddy system, so it gets managed. */
 static inline void __free_reserved_page(struct page *page)
 {
diff --git a/mm/nobootmem.c b/mm/nobootmem.c
index 5e95993c2613..4bea539921df 100644
--- a/mm/nobootmem.c
+++ b/mm/nobootmem.c
@@ -121,9 +121,6 @@ static unsigned long __init free_low_memory_core_early(void)
 
 	memblock_clear_hotplug(0, -1);
 
-	for_each_reserved_mem_region(i, &start, &end)
-                reserve_bootmem_region(start, end);
-
 	for_each_free_mem_range(i, NUMA_NO_NODE, &start, &end, NULL)
 		count += __free_memory_core(start, end);
 
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index cf31aac46e6a..db07d1e42c4e 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -801,22 +801,6 @@ static int free_tail_pages_check(struct page *head_page, struct page *page)
 	return 0;
 }
 
-/*
- * Initialised pages do not have PageReserved set. This function is
- * called for each range allocated by the bootmem allocator and
- * marks the pages PageReserved. The remaining valid pages are later
- * sent to the buddy page allocator.
- */
-void reserve_bootmem_region(unsigned long start, unsigned long end)
-{
-	unsigned long start_pfn = PFN_DOWN(start);
-	unsigned long end_pfn = PFN_UP(end);
-
-	for (; start_pfn < end_pfn; start_pfn++)
-		if (pfn_valid(start_pfn))
-			SetPageReserved(pfn_to_page(start_pfn));
-}
-
 static bool free_pages_prepare(struct page *page, unsigned int order)
 {
 	bool compound = PageCompound(page);