diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c
index 2f449e394a9..bb6a7237526 100644
--- a/sys/alpha/alpha/pmap.c
+++ b/sys/alpha/alpha/pmap.c
@@ -1717,11 +1717,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 		 */
 		if (origpte & PG_MANAGED) {
 			if ((origpte & PG_FOW) != PG_FOW
-			    && pmap_track_modified(va)) {
-				vm_page_t om;
-				om = PHYS_TO_VM_PAGE(opa);
-				vm_page_dirty(om);
-			}
+			    && pmap_track_modified(va))
+				vm_page_dirty(m);
 		}
 
 		managed = origpte & PG_MANAGED;
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 912bd526bb4..a9416736083 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -1921,11 +1921,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 		 * so we go ahead and sense modify status.
 		 */
 		if (origpte & PG_MANAGED) {
-			if ((origpte & PG_M) && pmap_track_modified(va)) {
-				vm_page_t om;
-				om = PHYS_TO_VM_PAGE(opa);
-				vm_page_dirty(om);
-			}
+			if ((origpte & PG_M) && pmap_track_modified(va))
+				vm_page_dirty(m);
 			pa |= PG_MANAGED;
 		}
 		goto validate;
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 02c22068631..680b8dd2c04 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -1986,11 +1986,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 		 * so we go ahead and sense modify status.
 		 */
 		if (origpte & PG_MANAGED) {
-			if ((origpte & PG_M) && pmap_track_modified(va)) {
-				vm_page_t om;
-				om = PHYS_TO_VM_PAGE(opa);
-				vm_page_dirty(om);
-			}
+			if ((origpte & PG_M) && pmap_track_modified(va))
+				vm_page_dirty(m);
 			pa |= PG_MANAGED;
 		}
 		goto validate;
diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c
index 8f624084a1c..1eb2578d6c7 100644
--- a/sys/ia64/ia64/pmap.c
+++ b/sys/ia64/ia64/pmap.c
@@ -1550,11 +1550,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 		 * so we go ahead and sense modify status.
 		 */
 		if (managed && pmap_lpte_dirty(&origpte) &&
-		    pmap_track_modified(va)) {
-			vm_page_t om;
-			om = PHYS_TO_VM_PAGE(opa);
-			vm_page_dirty(om);
-		}
+		    pmap_track_modified(va))
+			vm_page_dirty(m);
 
 		goto validate;
 	}