lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: clean up and simplify 64-bit split_large_page()

Browse Source 
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Ingo Molnar
2008-01-30 13:34:00 +01:00
parent 5e5224a77e
commit a5c6251488
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/mm/pageattr_64.c
View File

@@ -46,7 +46,7 @@ pte_t *lookup_address(unsigned long address, int *level)
} }
static struct page * static struct page *
split_large_page(unsigned long address, pgprot_t prot, pgprot_t ref_prot) split_large_page(unsigned long address, pgprot_t ref_prot)
{ {
unsigned long addr; unsigned long addr;
struct page *base; struct page *base;
@@ -60,10 +60,9 @@ split_large_page(unsigned long address, pgprot_t prot, pgprot_t ref_prot)
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);
for (i = 0; i < PTRS_PER_PTE; i++, addr += PAGE_SIZE) { for (i = 0; i < PTRS_PER_PTE; i++, addr += PAGE_SIZE)
pbase[i] = pfn_pte(addr >> PAGE_SHIFT, pbase[i] = pfn_pte(addr >> PAGE_SHIFT, ref_prot);
addr == address ? prot : ref_prot);
}
return base; return base;
} }
@@ -76,6 +75,7 @@ __change_page_attr(unsigned long address, unsigned long pfn, pgprot_t prot,
pgprot_t ref_prot2, oldprot; pgprot_t ref_prot2, oldprot;
int level; int level;
repeat:
kpte = lookup_address(address, &level); kpte = lookup_address(address, &level);
if (!kpte) if (!kpte)
return 0; return 0;
@@ -98,12 +98,12 @@ __change_page_attr(unsigned long address, unsigned long pfn, pgprot_t prot,
struct page *split; struct page *split;
ref_prot2 = pte_pgprot(pte_clrhuge(*kpte)); ref_prot2 = pte_pgprot(pte_clrhuge(*kpte));
split = split_large_page(address, prot, ref_prot2); split = split_large_page(address, ref_prot2);
if (!split) if (!split)
return -ENOMEM; return -ENOMEM;
pgprot_val(ref_prot2) &= ~_PAGE_NX; pgprot_val(ref_prot2) &= ~_PAGE_NX;
set_pte(kpte, mk_pte(split, ref_prot2)); set_pte(kpte, mk_pte(split, ref_prot2));
kpte_page = split; goto repeat;
} }
} else { } else {
if (level == 4) { if (level == 4) {