On Sun, Mar 10, 2013 at 10:01 AM, Jiang Liu <liuj97@xxxxxxxxx> wrote: > Use helper function free_highmem_page() to free highmem pages into > the buddy system. > > Signed-off-by: Jiang Liu <jiang.liu@xxxxxxxxxx> > --- > arch/x86/mm/highmem_32.c | 1 - > arch/x86/mm/init_32.c | 10 +--------- > 2 files changed, 1 insertion(+), 10 deletions(-) > > diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c > index 6f31ee5..252b8f5 100644 > --- a/arch/x86/mm/highmem_32.c > +++ b/arch/x86/mm/highmem_32.c > @@ -137,5 +137,4 @@ void __init set_highmem_pages_init(void) > add_highpages_with_active_regions(nid, zone_start_pfn, > zone_end_pfn); > } > - totalram_pages += totalhigh_pages; Hmm? I haven't looked at what totalram_pages is used for but could you explain why this change is safe? > } > diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c > index 2d19001..3ac7e31 100644 > --- a/arch/x86/mm/init_32.c > +++ b/arch/x86/mm/init_32.c > @@ -427,14 +427,6 @@ static void __init permanent_kmaps_init(pgd_t *pgd_base) > 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, > unsigned long start_pfn, unsigned long end_pfn) > { > @@ -448,7 +440,7 @@ void __init add_highpages_with_active_regions(int nid, > start_pfn, end_pfn); > for ( ; pfn < e_pfn; pfn++) > if (pfn_valid(pfn)) > - add_one_highpage_init(pfn_to_page(pfn)); > + free_highmem_page(pfn_to_page(pfn)); > } > } > #else > -- > 1.7.9.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>