From: Nick Piggin Stop using __put_page and page_count in i386 pageattr.c Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton --- arch/i386/mm/pageattr.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff -puN arch/i386/mm/pageattr.c~i386-pageattr-remove-__put_page arch/i386/mm/pageattr.c --- devel/arch/i386/mm/pageattr.c~i386-pageattr-remove-__put_page 2006-02-18 01:51:08.000000000 -0800 +++ devel-akpm/arch/i386/mm/pageattr.c 2006-02-18 01:51:08.000000000 -0800 @@ -51,6 +51,9 @@ static struct page *split_large_page(uns if (!base) return NULL; + SetPagePrivate(base); + page_private(base) = 0; + address = __pa(address); addr = address & LARGE_PAGE_MASK; pbase = (pte_t *)page_address(base); @@ -143,11 +146,12 @@ __change_page_attr(struct page *page, pg return -ENOMEM; set_pmd_pte(kpte,address,mk_pte(split, ref_prot)); kpte_page = split; - } - get_page(kpte_page); + } + page_private(kpte_page)++; } else if ((pte_val(*kpte) & _PAGE_PSE) == 0) { set_pte_atomic(kpte, mk_pte(page, PAGE_KERNEL)); - __put_page(kpte_page); + BUG_ON(page_private(kpte_page) == 0); + page_private(kpte_page)--; } else BUG(); @@ -157,10 +161,8 @@ __change_page_attr(struct page *page, pg * replace it with a largepage. */ if (!PageReserved(kpte_page)) { - /* memleak and potential failed 2M page regeneration */ - BUG_ON(!page_count(kpte_page)); - - if (cpu_has_pse && (page_count(kpte_page) == 1)) { + if (cpu_has_pse && (page_private(kpte_page) == 0)) { + ClearPagePrivate(kpte_page); list_add(&kpte_page->lru, &df_list); revert_page(kpte_page, address); } _