diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:56 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:56 +0100 |
| commit | 5508a7489659f1eed108d3ae7c2d36c8794ee330 (patch) | |
| tree | 518702b4f68c75c83bb2976e275cb53c5138488a /arch/x86/mm/pageattr_32.c | |
| parent | bb5c2dbd57d93a36b0386dd783dd95e0cbaaa23f (diff) | |
x86: cpa self-test fixes
cpa self-test fixes. change_page_attr_addr() was buggy, it
passed in a virtual address as a physical one.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/mm/pageattr_32.c')
| -rw-r--r-- | arch/x86/mm/pageattr_32.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/x86/mm/pageattr_32.c b/arch/x86/mm/pageattr_32.c index 14c923b3b07..ad0868bfa37 100644 --- a/arch/x86/mm/pageattr_32.c +++ b/arch/x86/mm/pageattr_32.c @@ -79,8 +79,10 @@ split_large_page(pte_t *kpte, unsigned long address, pgprot_t ref_prot) * up for us already: */ tmp = lookup_address(address, &level); - if (tmp != kpte) + if (tmp != kpte) { + WARN_ON_ONCE(1); goto out_unlock; + } address = __pa(address); addr = address & LARGE_PAGE_MASK; @@ -181,17 +183,19 @@ EXPORT_SYMBOL(change_page_attr); int change_page_attr_addr(unsigned long addr, int numpages, pgprot_t prot) { int i; - unsigned long pfn = (addr >> PAGE_SHIFT); + unsigned long pfn = (__pa(addr) >> PAGE_SHIFT); for (i = 0; i < numpages; i++) { if (!pfn_valid(pfn + i)) { + WARN_ON_ONCE(1); break; } else { int level; pte_t *pte = lookup_address(addr + i*PAGE_SIZE, &level); - BUG_ON(pte && !pte_none(*pte)); + BUG_ON(pte && pte_none(*pte)); } } + return change_page_attr(virt_to_page(addr), i, prot); } |