From 88e9582a49a4cbafd7ebf4917bb5cdea5eb2e8c7 Mon Sep 17 00:00:00 2001 From: alc Date: Tue, 6 Jul 2004 02:33:11 +0000 Subject: [PATCH] Style changes to pmap_extract(). --- sys/amd64/amd64/pmap.c | 8 +++----- sys/i386/i386/pmap.c | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 4ab963062a2e..d9a3725ce829 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -760,15 +760,13 @@ pmap_is_current(pmap_t pmap) * with the given map/virtual_address pair. */ vm_paddr_t -pmap_extract(pmap, va) - register pmap_t pmap; - vm_offset_t va; +pmap_extract(pmap_t pmap, vm_offset_t va) { vm_paddr_t rtval; pt_entry_t *pte; pd_entry_t pde, *pdep; - if (pmap == 0) + if (pmap == NULL) return 0; PMAP_LOCK(pmap); pdep = pmap_pde(pmap, va); @@ -781,7 +779,7 @@ pmap_extract(pmap, va) return rtval; } pte = pmap_pte(pmap, va); - rtval = ((*pte & PG_FRAME) | (va & PAGE_MASK)); + rtval = (*pte & PG_FRAME) | (va & PAGE_MASK); PMAP_UNLOCK(pmap); return rtval; } diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 5f096a26126b..56c03d1b4308 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -821,15 +821,13 @@ pmap_pte_quick(pmap_t pmap, vm_offset_t va) * with the given map/virtual_address pair. */ vm_paddr_t -pmap_extract(pmap, va) - register pmap_t pmap; - vm_offset_t va; +pmap_extract(pmap_t pmap, vm_offset_t va) { vm_paddr_t rtval; pt_entry_t *pte; pd_entry_t pde; - if (pmap == 0) + if (pmap == NULL) return 0; PMAP_LOCK(pmap); pde = pmap->pm_pdir[va >> PDRSHIFT]; @@ -840,7 +838,7 @@ pmap_extract(pmap, va) return rtval; } pte = pmap_pte(pmap, va); - rtval = ((*pte & PG_FRAME) | (va & PAGE_MASK)); + rtval = (*pte & PG_FRAME) | (va & PAGE_MASK); PMAP_UNLOCK(pmap); return rtval; }