diff options
| author |   deraadt <deraadt@openbsd.org> | 2013-03-28 16:27:31 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2013-03-28 16:27:31 +0000 |
| commit | 7468fac67961ba0db81721ffacb564ed35aba31d (patch) | |
| tree | 4f015beda1defbf84e72bd574ec9d07aa0160aa2 /lib/libkvm/kvm_i386.c | |
| parent | If -s to swap-pane is not given, use the current pane. (diff) | |
| download | wireguard-openbsd-7468fac67961ba0db81721ffacb564ed35aba31d.tar.xz wireguard-openbsd-7468fac67961ba0db81721ffacb564ed35aba31d.zip | |
Avoid using PAGE_SHIFT, PAGE_SIZE, and PAGE_MASK defines, since we already
know it from the machine.
ok miod
Diffstat (limited to 'lib/libkvm/kvm_i386.c')
| -rw-r--r-- | lib/libkvm/kvm_i386.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c index a270d67eac5..54109723296 100644 --- a/lib/libkvm/kvm_i386.c +++ b/lib/libkvm/kvm_i386.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kvm_i386.c,v 1.22 2012/07/09 08:43:10 deraadt Exp $ */ +/* $OpenBSD: kvm_i386.c,v 1.23 2013/03/28 16:27:31 deraadt Exp $ */ /* $NetBSD: kvm_i386.c,v 1.9 1996/03/18 22:33:38 thorpej Exp $ */ /*- @@ -101,10 +101,10 @@ _kvm_initvtop(kvm_t *kd) (off_t)_kvm_pa2off(kd, nl[0].n_value - KERNBASE)) != sizeof pa) goto invalid; - vm->PTD = (pd_entry_t *)_kvm_malloc(kd, PAGE_SIZE); + vm->PTD = (pd_entry_t *)_kvm_malloc(kd, kd->nbpg); - if (_kvm_pread(kd, kd->pmfd, vm->PTD, PAGE_SIZE, - (off_t)_kvm_pa2off(kd, pa)) != PAGE_SIZE) + if (_kvm_pread(kd, kd->pmfd, vm->PTD, kd->nbpg, + (off_t)_kvm_pa2off(kd, pa)) != kd->nbpg) goto invalid; return (0); @@ -138,7 +138,7 @@ _kvm_kvatop(kvm_t *kd, u_long va, paddr_t *pa) } vm = kd->vmst; - offset = va & PAGE_MASK; + offset = va & (kd->nbpg - 1); /* * If we are initializing (kernel page table descriptor pointer @@ -146,7 +146,7 @@ _kvm_kvatop(kvm_t *kd, u_long va, paddr_t *pa) */ if (vm->PTD == NULL) { *pa = va; - return (PAGE_SIZE - (int)offset); + return (kd->nbpg - (int)offset); } if ((vm->PTD[pdei(va)] & PG_V) == 0) goto invalid; @@ -160,7 +160,7 @@ _kvm_kvatop(kvm_t *kd, u_long va, paddr_t *pa) goto invalid; *pa = (pte & PG_FRAME) + offset; - return (PAGE_SIZE - (int)offset); + return (kd->nbpg - (int)offset); invalid: _kvm_err(kd, 0, "invalid address (%lx)", va); |