redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] i386: pageattr remove __put_page

Browse source 
Stop using __put_page and page_count in i386 pageattr.c

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Nick Piggin 2006-03-22 00:08:31 -08:00 committed by Linus Torvalds
parent f9aed0e253
commit 84d1c054b1
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
arch/i386/mm/pageattr.c
View file

@ -51,6 +51,13 @@ static struct page *split_large_page(unsigned long address, pgprot_t prot,
if (!base) if (!base)
return NULL; return NULL;
/*
* page_private is used to track the number of entries in
* the page table page that have non standard attributes.
*/
SetPagePrivate(base);
page_private(base) = 0;
address = __pa(address); address = __pa(address);
addr = address & LARGE_PAGE_MASK; addr = address & LARGE_PAGE_MASK;
pbase = (pte_t *)page_address(base); pbase = (pte_t *)page_address(base);
@ -143,11 +150,12 @@ __change_page_attr(struct page *page, pgprot_t prot)
return -ENOMEM; return -ENOMEM;
set_pmd_pte(kpte,address,mk_pte(split, ref_prot)); set_pmd_pte(kpte,address,mk_pte(split, ref_prot));
kpte_page = split; kpte_page = split;
} }
get_page(kpte_page); page_private(kpte_page)++;
} else if ((pte_val(*kpte) & _PAGE_PSE) == 0) { } else if ((pte_val(*kpte) & _PAGE_PSE) == 0) {
set_pte_atomic(kpte, mk_pte(page, PAGE_KERNEL)); 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 } else
BUG(); BUG();
@ -157,10 +165,8 @@ __change_page_attr(struct page *page, pgprot_t prot)
* replace it with a largepage. * replace it with a largepage.
*/ */
if (!PageReserved(kpte_page)) { if (!PageReserved(kpte_page)) {
/* memleak and potential failed 2M page regeneration */ if (cpu_has_pse && (page_private(kpte_page) == 0)) {
BUG_ON(!page_count(kpte_page)); ClearPagePrivate(kpte_page);
if (cpu_has_pse && (page_count(kpte_page) == 1)) {
list_add(&kpte_page->lru, &df_list); list_add(&kpte_page->lru, &df_list);
revert_page(kpte_page, address); revert_page(kpte_page, address);
} }