diff options
author | 2002-03-18 07:48:11 +0000 | |
---|---|---|
committer | 2002-03-18 07:48:11 +0000 | |
commit | 950c866b1ec90d43849c9f5e5cc2f6d3f7d4ee6c (patch) | |
tree | f9a128aea430bfb041d02241d8ea9f41ea72fb31 | |
parent | $OpenBSD$ (diff) | |
download | wireguard-openbsd-950c866b1ec90d43849c9f5e5cc2f6d3f7d4ee6c.tar.xz wireguard-openbsd-950c866b1ec90d43849c9f5e5cc2f6d3f7d4ee6c.zip |
These are macro inlines on vax, so check if they're defined before
trying to prototype them. millert@ ok.
-rw-r--r-- | sys/sys/proc.h | 8 | ||||
-rw-r--r-- | sys/uvm/uvm_pmap.h | 12 |
2 files changed, 18 insertions, 2 deletions
diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 4b3f4a2eb5d..e6271e83564 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.58 2002/03/14 03:16:12 millert Exp $ */ +/* $OpenBSD: proc.h,v 1.59 2002/03/18 07:48:11 hugh Exp $ */ /* $NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $ */ /*- @@ -367,10 +367,14 @@ void preempt(struct proc *); void mi_switch(void); void pgdelete(struct pgrp *pgrp); void procinit(void); +#if !defined(remrunqueue) void remrunqueue(struct proc *); +#endif void resetpriority(struct proc *); void setrunnable(struct proc *); +#if !defined(setrunqueue) void setrunqueue(struct proc *); +#endif void sleep(void *chan, int pri); void uvm_swapin(struct proc *); /* XXX: uvm_extern.h? */ int ltsleep(void *chan, int pri, const char *wmesg, int timo, @@ -387,7 +391,9 @@ int fork1(struct proc *, int, int, void *, size_t, void (*)(void *), void *, register_t *); void rqinit(void); int groupmember(gid_t, struct ucred *); +#if !defined(cpu_switch) void cpu_switch(struct proc *); +#endif #if !defined(cpu_wait) void cpu_wait(struct proc *); #endif diff --git a/sys/uvm/uvm_pmap.h b/sys/uvm/uvm_pmap.h index 86cd023fc43..a30bba6069b 100644 --- a/sys/uvm/uvm_pmap.h +++ b/sys/uvm/uvm_pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_pmap.h,v 1.13 2002/03/18 07:42:45 hugh Exp $ */ +/* $OpenBSD: uvm_pmap.h,v 1.14 2002/03/18 07:48:11 hugh Exp $ */ /* $NetBSD: uvm_pmap.h,v 1.1 2000/06/27 09:00:14 mrg Exp $ */ /* @@ -118,11 +118,15 @@ boolean_t pmap_clear_modify(struct vm_page *); boolean_t pmap_clear_reference(struct vm_page *); #endif +#if !defined(pmap_collect) void pmap_collect(pmap_t); +#endif #if !defined(pmap_copy) void pmap_copy(pmap_t, pmap_t, vaddr_t, vsize_t, vaddr_t); #endif +#if !defined(pmap_copy_page) void pmap_copy_page(paddr_t, paddr_t); +#endif struct pmap *pmap_create(void); void pmap_destroy(pmap_t); int pmap_enter(pmap_t, @@ -150,12 +154,18 @@ paddr_t pmap_phys_address(int); #endif void pmap_protect(pmap_t, vaddr_t, vaddr_t, vm_prot_t); +#if !defined(pmap_reference) void pmap_reference(pmap_t); +#endif +#if !defined(pmap_remove) void pmap_remove(pmap_t, vaddr_t, vaddr_t); +#endif #if !defined(pmap_update) void pmap_update(void); #endif +#if !defined(pmap_zero_page) void pmap_zero_page(paddr_t); +#endif void pmap_virtual_space(vaddr_t *, vaddr_t *); #if defined(PMAP_STEAL_MEMORY) |