diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2014-01-30 18:16:42 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2014-01-30 18:16:42 +0000 |
| commit | 150ead6262ab7cbac1aa9cd45e3a1c47544e5c15 (patch) | |
| tree | 1e82bc7c9335d090e0a0f0f3f4e179717b201a6e /sys/arch/hppa | |
| parent | ba74087eb3865e1609b3d666f13601206dc40297 (diff) | |
Move declaration of struct vm_page_md from <machine/vmparam.h> to
<machine/pmap.h> where it belongs, and compensate in <uvm/uvm_extern.h>
by including <uvm/uvm_pmap.h> before <uvm/uvm_page.h>. Tested on all
MACHINE_ARCH but amd64 and i386 (and hppa64).
Diffstat (limited to 'sys/arch/hppa')
| -rw-r--r-- | sys/arch/hppa/include/pmap.h | 21 | ||||
| -rw-r--r-- | sys/arch/hppa/include/vmparam.h | 20 |
2 files changed, 21 insertions, 20 deletions
diff --git a/sys/arch/hppa/include/pmap.h b/sys/arch/hppa/include/pmap.h index b80b1f4bc02..43135a46ef0 100644 --- a/sys/arch/hppa/include/pmap.h +++ b/sys/arch/hppa/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.44 2013/03/31 17:07:03 deraadt Exp $ */ +/* $OpenBSD: pmap.h,v 1.45 2014/01/30 18:16:41 miod Exp $ */ /* * Copyright (c) 2002-2004 Michael Shalayeff @@ -156,4 +156,23 @@ pmap_protect(struct pmap *pmap, vaddr_t sva, vaddr_t eva, vm_prot_t prot) } #endif /* _KERNEL */ + +#if !defined(_LOCORE) + +#include <sys/lock.h> + +struct pv_entry; +struct vm_page_md { + struct simplelock pvh_lock; /* locks every pv on this list */ + struct pv_entry *pvh_list; /* head of list (locked by pvh_lock) */ + u_int pvh_attrs; /* to preserve ref/mod */ +}; + +#define VM_MDPAGE_INIT(pg) do { \ + simple_lock_init(&(pg)->mdpage.pvh_lock); \ + (pg)->mdpage.pvh_list = NULL; \ + (pg)->mdpage.pvh_attrs = 0; \ +} while (0) +#endif + #endif /* _MACHINE_PMAP_H_ */ diff --git a/sys/arch/hppa/include/vmparam.h b/sys/arch/hppa/include/vmparam.h index c2a528d2e5a..de0bfea035b 100644 --- a/sys/arch/hppa/include/vmparam.h +++ b/sys/arch/hppa/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.41 2014/01/24 05:21:19 miod Exp $ */ +/* $OpenBSD: vmparam.h,v 1.42 2014/01/30 18:16:41 miod Exp $ */ /* * Copyright (c) 1988-1994, The University of Utah and @@ -92,22 +92,4 @@ #define VM_PHYSSEG_NOADD /* XXX until uvm code is fixed */ -#if !defined(_LOCORE) - -#include <sys/lock.h> - -struct pv_entry; -struct vm_page_md { - struct simplelock pvh_lock; /* locks every pv on this list */ - struct pv_entry *pvh_list; /* head of list (locked by pvh_lock) */ - u_int pvh_attrs; /* to preserve ref/mod */ -}; - -#define VM_MDPAGE_INIT(pg) do { \ - simple_lock_init(&(pg)->mdpage.pvh_lock); \ - (pg)->mdpage.pvh_list = NULL; \ - (pg)->mdpage.pvh_attrs = 0; \ -} while (0) -#endif - #endif /* _MACHINE_VMPARAM_H_ */ |