Commit 5e7ccf86 authored by Jiang Liu's avatar Jiang Liu Committed by Linus Torvalds

mm/x86: use free_highmem_page() to free highmem pages into buddy system

Use helper function free_highmem_page() to free highmem pages into
the buddy system.
Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Cong Wang <amwang@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Attilio Rao <attilio.rao@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: default avatarPekka Enberg <penberg@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5b472b20
...@@ -137,5 +137,4 @@ void __init set_highmem_pages_init(void) ...@@ -137,5 +137,4 @@ void __init set_highmem_pages_init(void)
add_highpages_with_active_regions(nid, zone_start_pfn, add_highpages_with_active_regions(nid, zone_start_pfn,
zone_end_pfn); zone_end_pfn);
} }
totalram_pages += totalhigh_pages;
} }
...@@ -427,14 +427,6 @@ static void __init permanent_kmaps_init(pgd_t *pgd_base) ...@@ -427,14 +427,6 @@ static void __init permanent_kmaps_init(pgd_t *pgd_base)
pkmap_page_table = pte; pkmap_page_table = pte;
} }
static void __init add_one_highpage_init(struct page *page)
{
ClearPageReserved(page);
init_page_count(page);
__free_page(page);
totalhigh_pages++;
}
void __init add_highpages_with_active_regions(int nid, void __init add_highpages_with_active_regions(int nid,
unsigned long start_pfn, unsigned long end_pfn) unsigned long start_pfn, unsigned long end_pfn)
{ {
...@@ -448,7 +440,7 @@ void __init add_highpages_with_active_regions(int nid, ...@@ -448,7 +440,7 @@ void __init add_highpages_with_active_regions(int nid,
start_pfn, end_pfn); start_pfn, end_pfn);
for ( ; pfn < e_pfn; pfn++) for ( ; pfn < e_pfn; pfn++)
if (pfn_valid(pfn)) if (pfn_valid(pfn))
add_one_highpage_init(pfn_to_page(pfn)); free_highmem_page(pfn_to_page(pfn));
} }
} }
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment