diff options
| author | dg <dg@FreeBSD.org> | 1995-10-22 02:59:48 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 1995-10-22 02:59:48 +0000 |
| commit | 67678134fdc677845e30d947c441374ac61106a6 (patch) | |
| tree | 1b08f6724b5c5359a7a4d405cbdbffc5fb887d80 | |
| parent | 1d0b031279893f7cefaf171f452d26935986b98d (diff) | |
| download | FreeBSD-src-67678134fdc677845e30d947c441374ac61106a6.zip FreeBSD-src-67678134fdc677845e30d947c441374ac61106a6.tar.gz | |
Simplified some expressions.
| -rw-r--r-- | sys/amd64/amd64/pmap.c | 11 | ||||
| -rw-r--r-- | sys/i386/i386/pmap.c | 11 |
2 files changed, 8 insertions, 14 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 12ee514..9f99551 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.60 1995/07/28 11:21:06 davidg Exp $ + * $Id: pmap.c,v 1.61 1995/09/15 08:31:19 davidg Exp $ */ /* @@ -851,8 +851,7 @@ pmap_remove(pmap, sva, eva) if (pmap_is_managed(pa)) { if ((int) oldpte & PG_M) { - if ((sva < USRSTACK || sva >= KERNBASE) || - (sva >= USRSTACK && sva < USRSTACK + (UPAGES * NBPG))) { + if (sva < USRSTACK + (UPAGES * NBPG) || sva >= KERNBASE) { if (sva < clean_sva || sva >= clean_eva) { PHYS_TO_VM_PAGE(pa)->dirty |= VM_PAGE_BITS_ALL; } @@ -932,8 +931,7 @@ pmap_remove(pmap, sva, eva) continue; } if ((int) oldpte & PG_M) { - if ((va < USRSTACK || va >= KERNBASE) || - (va >= USRSTACK && va < USRSTACK + (UPAGES * NBPG))) { + if (va < USRSTACK + (UPAGES * NBPG) || va >= KERNBASE) { if (va < clean_sva || va >= clean_eva) { PHYS_TO_VM_PAGE(pa)->dirty |= VM_PAGE_BITS_ALL; } @@ -1001,8 +999,7 @@ pmap_remove_all(pa) * Update the vm_page_t clean and reference bits. */ if ((int) *pte & PG_M) { - if ((va < USRSTACK || va >= KERNBASE) || - (va >= USRSTACK && va < USRSTACK + (UPAGES * NBPG))) { + if (va < USRSTACK + (UPAGES * NBPG) || va >= KERNBASE) { if (va < clean_sva || va >= clean_eva) { PHYS_TO_VM_PAGE(pa)->dirty |= VM_PAGE_BITS_ALL; } diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 12ee514..9f99551 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.60 1995/07/28 11:21:06 davidg Exp $ + * $Id: pmap.c,v 1.61 1995/09/15 08:31:19 davidg Exp $ */ /* @@ -851,8 +851,7 @@ pmap_remove(pmap, sva, eva) if (pmap_is_managed(pa)) { if ((int) oldpte & PG_M) { - if ((sva < USRSTACK || sva >= KERNBASE) || - (sva >= USRSTACK && sva < USRSTACK + (UPAGES * NBPG))) { + if (sva < USRSTACK + (UPAGES * NBPG) || sva >= KERNBASE) { if (sva < clean_sva || sva >= clean_eva) { PHYS_TO_VM_PAGE(pa)->dirty |= VM_PAGE_BITS_ALL; } @@ -932,8 +931,7 @@ pmap_remove(pmap, sva, eva) continue; } if ((int) oldpte & PG_M) { - if ((va < USRSTACK || va >= KERNBASE) || - (va >= USRSTACK && va < USRSTACK + (UPAGES * NBPG))) { + if (va < USRSTACK + (UPAGES * NBPG) || va >= KERNBASE) { if (va < clean_sva || va >= clean_eva) { PHYS_TO_VM_PAGE(pa)->dirty |= VM_PAGE_BITS_ALL; } @@ -1001,8 +999,7 @@ pmap_remove_all(pa) * Update the vm_page_t clean and reference bits. */ if ((int) *pte & PG_M) { - if ((va < USRSTACK || va >= KERNBASE) || - (va >= USRSTACK && va < USRSTACK + (UPAGES * NBPG))) { + if (va < USRSTACK + (UPAGES * NBPG) || va >= KERNBASE) { if (va < clean_sva || va >= clean_eva) { PHYS_TO_VM_PAGE(pa)->dirty |= VM_PAGE_BITS_ALL; } |
