diff options
author | cperciva <cperciva@FreeBSD.org> | 2010-12-28 14:36:32 +0000 |
---|---|---|
committer | cperciva <cperciva@FreeBSD.org> | 2010-12-28 14:36:32 +0000 |
commit | 35c87db32c7c03d107c9b3ba0a865dd78eb7bf16 (patch) | |
tree | 5711f64e8e3f8c830aeff9e3b0b80653fe581680 /sys/i386/xen/pmap.c | |
parent | 713ef02a1f782c52b5a7a985ce0f49312efd9a4d (diff) | |
download | FreeBSD-src-35c87db32c7c03d107c9b3ba0a865dd78eb7bf16.zip FreeBSD-src-35c87db32c7c03d107c9b3ba0a865dd78eb7bf16.tar.gz |
Remove a "not strictly correct" (and panic-inducing) workaround for a bug
which doesn't seem to exist.
PR: kern/141328
MFC after: 3 days
Diffstat (limited to 'sys/i386/xen/pmap.c')
-rw-r--r-- | sys/i386/xen/pmap.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sys/i386/xen/pmap.c b/sys/i386/xen/pmap.c index 9d72ad5..e956777 100644 --- a/sys/i386/xen/pmap.c +++ b/sys/i386/xen/pmap.c @@ -2225,27 +2225,14 @@ pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t va, vm_page_t *free) if (oldpte & PG_G) pmap_invalidate_page(kernel_pmap, va); pmap->pm_stats.resident_count -= 1; - /* - * XXX This is not strictly correctly, but somewhere along the line - * we are losing the managed bit on some pages. It is unclear to me - * why, but I think the most likely explanation is that xen's writable - * page table implementation doesn't respect the unused bits. - */ - if ((oldpte & PG_MANAGED) || ((oldpte & PG_V) && (va < VM_MAXUSER_ADDRESS)) - ) { + if (oldpte & PG_MANAGED) { m = PHYS_TO_VM_PAGE(xpmap_mtop(oldpte) & PG_FRAME); - - if (!(oldpte & PG_MANAGED)) - printf("va=0x%x is unmanaged :-( pte=0x%llx\n", va, oldpte); - if ((oldpte & (PG_M | PG_RW)) == (PG_M | PG_RW)) vm_page_dirty(m); if (oldpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); pmap_remove_entry(pmap, m, va); - } else if ((va < VM_MAXUSER_ADDRESS) && (oldpte & PG_V)) - printf("va=0x%x is unmanaged :-( pte=0x%llx\n", va, oldpte); - + } return (pmap_unuse_pt(pmap, va, free)); } |