diff options
| author | alc <alc@FreeBSD.org> | 2008-07-18 20:07:50 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2008-07-18 20:07:50 +0000 |
| commit | 07ead1871536cc17dfecbaa10fd4b92fb73c1e4c (patch) | |
| tree | ffa2c57aaa874290d519425087d5702041b189ee /sys/amd64 | |
| parent | 1e148a8be3dad2c22a49c11fc8fc2b1fcad4d26a (diff) | |
| download | FreeBSD-src-07ead1871536cc17dfecbaa10fd4b92fb73c1e4c.zip FreeBSD-src-07ead1871536cc17dfecbaa10fd4b92fb73c1e4c.tar.gz | |
Simplify pmap_extract()'s control flow, making it more like the related
functions pmap_extract_and_hold() and pmap_kextract().
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/pmap.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 61e5804..6e92d23 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -986,13 +986,12 @@ pmap_extract(pmap_t pmap, vm_offset_t va) if (pdep != NULL) { pde = *pdep; if (pde) { - if ((pde & PG_PS) != 0) { + if ((pde & PG_PS) != 0) rtval = (pde & PG_PS_FRAME) | (va & PDRMASK); - PMAP_UNLOCK(pmap); - return rtval; + else { + pte = pmap_pde_to_pte(pdep, va); + rtval = (*pte & PG_FRAME) | (va & PAGE_MASK); } - pte = pmap_pde_to_pte(pdep, va); - rtval = (*pte & PG_FRAME) | (va & PAGE_MASK); } } PMAP_UNLOCK(pmap); |
