diff options
author | 2016-03-09 16:45:43 +0000 | |
---|---|---|
committer | 2016-03-09 16:45:43 +0000 | |
commit | 506b7e65c0e0ce63d10fd931bf76ee4a6a58e570 (patch) | |
tree | 7d65b605d269770d97b4e81b12371e08bfbb6bd4 | |
parent | remove __vax__ (diff) | |
download | wireguard-openbsd-506b7e65c0e0ce63d10fd931bf76ee4a6a58e570.tar.xz wireguard-openbsd-506b7e65c0e0ce63d10fd931bf76ee4a6a58e570.zip |
remove vaxisms
-rw-r--r-- | sys/uvm/uvm_map.c | 4 | ||||
-rw-r--r-- | sys/uvm/uvm_mmap.c | 6 | ||||
-rw-r--r-- | sys/uvm/uvm_page.h | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c index 1ff63b72884..65afd835155 100644 --- a/sys/uvm/uvm_map.c +++ b/sys/uvm/uvm_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_map.c,v 1.207 2016/03/06 08:56:16 stefan Exp $ */ +/* $OpenBSD: uvm_map.c,v 1.208 2016/03/09 16:45:43 deraadt Exp $ */ /* $NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $ */ /* @@ -3769,13 +3769,11 @@ uvm_map_hint(struct vmspace *vm, vm_prot_t prot, vaddr_t minaddr, */ if (vm->vm_dused < spacing >> PAGE_SHIFT) addr += BRKSIZ; -#if !defined(__vax__) if (addr < maxaddr) { while (spacing > maxaddr - addr) spacing >>= 1; } addr += arc4random() & spacing; -#endif return (round_page(addr)); } diff --git a/sys/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c index 5429923b550..f1daa09b130 100644 --- a/sys/uvm/uvm_mmap.c +++ b/sys/uvm/uvm_mmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_mmap.c,v 1.122 2015/11/11 15:59:33 mmcc Exp $ */ +/* $OpenBSD: uvm_mmap.c,v 1.123 2016/03/09 16:45:43 deraadt Exp $ */ /* $NetBSD: uvm_mmap.c,v 1.49 2001/02/18 21:19:08 chs Exp $ */ /* @@ -1137,7 +1137,7 @@ uvm_mmapfile(vm_map_t map, vaddr_t *addr, vsize_t size, vm_prot_t prot, int sys_kbind(struct proc *p, void *v, register_t *retval) { -#if defined(__vax__) || defined(__hppa64__) +#if defined(__hppa64__) /* only exists to support ld.so */ sigexit(p, SIGSYS); /* NOTREACHED */ @@ -1258,5 +1258,5 @@ sys_kbind(struct proc *p, void *v, register_t *retval) uvm_unmap_detach(&dead_entries, AMAP_REFALL); return (error); -#endif /* !vax && !hppa64 */ +#endif /* !hppa64 */ } diff --git a/sys/uvm/uvm_page.h b/sys/uvm/uvm_page.h index 1300b3b96b9..6d74f6d4c47 100644 --- a/sys/uvm/uvm_page.h +++ b/sys/uvm/uvm_page.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_page.h,v 1.60 2015/10/08 15:58:38 kettenis Exp $ */ +/* $OpenBSD: uvm_page.h,v 1.61 2016/03/09 16:45:43 deraadt Exp $ */ /* $NetBSD: uvm_page.h,v 1.19 2000/12/28 08:24:55 chs Exp $ */ /* @@ -243,7 +243,7 @@ psize_t uvm_pagecount(struct uvm_constraint_range*); #if VM_PHYSSEG_MAX == 1 /* - * Inline functions for archs like the vax where function calls are expensive. + * Inline functions for archs where function calls are expensive. */ /* * vm_physseg_find: find vm_physseg structure that belongs to a PA |