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_m68k.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_m68k.c')
| -rw-r--r-- | lib/libkvm/kvm_m68k.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libkvm/kvm_m68k.c b/lib/libkvm/kvm_m68k.c index b66552b392f..8f98263f95a 100644 --- a/lib/libkvm/kvm_m68k.c +++ b/lib/libkvm/kvm_m68k.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kvm_m68k.c,v 1.20 2012/07/09 08:43:10 deraadt Exp $ */ +/* $OpenBSD: kvm_m68k.c,v 1.21 2013/03/28 16:27:31 deraadt Exp $ */ /* $NetBSD: kvm_m68k.c,v 1.9 1996/05/07 06:09:11 leo Exp $ */ /*- @@ -67,8 +67,8 @@ #include <machine/kcore.h> #ifndef btop -#define btop(x) (((unsigned)(x)) >> PAGE_SHIFT) /* XXX */ -#define ptob(x) ((caddr_t)((x) << PAGE_SHIFT)) /* XXX */ +#define btop(x) (((unsigned)(x)) / kd->nbpg) /* XXX */ +#define ptob(x) ((caddr_t)((x) * kd->nbpg)) /* XXX */ #endif void @@ -97,7 +97,7 @@ _kvm_vatop(kvm_t *kd, st_entry_t *sta, u_long va, u_long *pa) _kvm_err(kd, 0, "vatop called in live kernel!"); return (0); } - offset = va & PAGE_MASK; + offset = va & (kd->nbpg - 1); cpu_kh = kd->cpu_data; /* * If we are initializing (kernel segment table pointer not yet set) @@ -105,7 +105,7 @@ _kvm_vatop(kvm_t *kd, st_entry_t *sta, u_long va, u_long *pa) */ if (cpu_kh->sysseg_pa == 0) { *pa = va + cpu_kh->kernel_pa; - return (PAGE_SIZE - offset); + return (kd->nbpg - offset); } if (cpu_kh->mmutype == MMU_68040 || cpu_kh->mmutype == MMU_68060) { st_entry_t *sta2; @@ -174,7 +174,7 @@ _kvm_vatop(kvm_t *kd, st_entry_t *sta, u_long va, u_long *pa) } *pa = addr + offset; - return (PAGE_SIZE - offset); + return (kd->nbpg - offset); invalid: _kvm_err(kd, 0, "invalid address (%lx)", va); return (0); |