summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Cox <alc@FreeBSD.org>2004-07-07 16:47:58 +0000
committerAlan Cox <alc@FreeBSD.org>2004-07-07 16:47:58 +0000
commit26a965568d2862cf23f008aa628a2a110d1dd60f (patch)
tree5affbcea5ed08f487c2cfee283d7f92906541ef5
parent9779075afac12cd9d8f0d5d5cd115defccc79af2 (diff)
Notes
-rw-r--r--sys/amd64/amd64/pmap.c7
-rw-r--r--sys/i386/i386/pmap.c7
2 files changed, 6 insertions, 8 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index d7492154f700..87489235a847 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -766,8 +766,9 @@ pmap_extract(pmap_t pmap, vm_offset_t va)
pt_entry_t *pte;
pd_entry_t pde, *pdep;
+ rtval = 0;
if (pmap == NULL)
- return 0;
+ return (rtval);
PMAP_LOCK(pmap);
pdep = pmap_pde(pmap, va);
if (pdep != NULL) {
@@ -780,12 +781,10 @@ pmap_extract(pmap_t pmap, vm_offset_t va)
}
pte = pmap_pte(pmap, va);
rtval = (*pte & PG_FRAME) | (va & PAGE_MASK);
- PMAP_UNLOCK(pmap);
- return rtval;
}
}
PMAP_UNLOCK(pmap);
- return 0;
+ return (rtval);
}
/*
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index befdeb11fef0..74d6f92cb7e5 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -827,8 +827,9 @@ pmap_extract(pmap_t pmap, vm_offset_t va)
pt_entry_t *pte;
pd_entry_t pde;
+ rtval = 0;
if (pmap == NULL)
- return 0;
+ return (rtval);
PMAP_LOCK(pmap);
pde = pmap->pm_pdir[va >> PDRSHIFT];
if (pde != 0) {
@@ -839,11 +840,9 @@ pmap_extract(pmap_t pmap, vm_offset_t va)
}
pte = pmap_pte(pmap, va);
rtval = (*pte & PG_FRAME) | (va & PAGE_MASK);
- PMAP_UNLOCK(pmap);
- return rtval;
}
PMAP_UNLOCK(pmap);
- return 0;
+ return (rtval);
}
/*