diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-01-12 23:37:02 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-01-12 23:37:02 +0000 |
| commit | 961175086f1159fdc7b6e042e882711716b8007e (patch) | |
| tree | f8c41657797577dfd0ca7f339729cb870fbd0017 /sys | |
| parent | 3c7106a9efb45204ab269422f9d163527924e771 (diff) | |
move pmap_physseg back to vmparam.h where it belongs.
define PMAP_PREFER in pmap.h, as afar as i understand it works.
no more pmap_changebit()
grow USRIOSIZE in vmparam.h
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/hppa/include/pmap.h | 19 | ||||
| -rw-r--r-- | sys/arch/hppa/include/vmparam.h | 9 |
2 files changed, 20 insertions, 8 deletions
diff --git a/sys/arch/hppa/include/pmap.h b/sys/arch/hppa/include/pmap.h index 9b73539f2ef..f586f4785c9 100644 --- a/sys/arch/hppa/include/pmap.h +++ b/sys/arch/hppa/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.12 1999/12/12 03:16:26 mickey Exp $ */ +/* $OpenBSD: pmap.h,v 1.13 2001/01/12 23:37:01 mickey Exp $ */ /* * Copyright (c) 1998,1999 Michael Shalayeff @@ -140,10 +140,6 @@ struct pv_page { struct pv_entry pvp_pv[NPVPPG]; }; -struct pmap_physseg { - struct pv_entry *pvent; -}; - #define HPPA_MAX_PID 0xfffa #define HPPA_SID_KERNEL 0 #define HPPA_PID_KERNEL 2 @@ -161,6 +157,18 @@ extern void gateway_page __P((void)); #define PMAP_STEAL_MEMORY /* we have some memory to steal */ +/* + * according to the parisc manual aliased va's should be + * different by high 12 bits only. + */ +#define PMAP_PREFER(o,h) do { \ + vaddr_t pmap_prefer_hint; \ + pmap_prefer_hint = (*(h) & HPPA_PGAMASK) | ((o) & HPPA_PGAOFF); \ + if (pmap_prefer_hint < *(h)) \ + pmap_prefer_hint += HPPA_PGALIAS; \ + *(h) = pmap_prefer_hint; \ +} while(0) + #define pmap_kernel_va(VA) \ (((VA) >= VM_MIN_KERNEL_ADDRESS) && ((VA) <= VM_MAX_KERNEL_ADDRESS)) @@ -191,7 +199,6 @@ pmap_prot(struct pmap *pmap, int prot) } void pmap_bootstrap __P((vaddr_t *, vaddr_t *)); -void pmap_changebit __P((vm_page_t, u_int, u_int)); #endif /* _KERNEL */ #endif /* _MACHINE_PMAP_H_ */ diff --git a/sys/arch/hppa/include/vmparam.h b/sys/arch/hppa/include/vmparam.h index 220e3ca0d59..7ec4fee829a 100644 --- a/sys/arch/hppa/include/vmparam.h +++ b/sys/arch/hppa/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.9 1999/09/18 20:05:55 mickey Exp $ */ +/* $OpenBSD: vmparam.h,v 1.10 2001/01/12 23:37:01 mickey Exp $ */ /* * Copyright (c) 1988-1994, The University of Utah and @@ -74,7 +74,7 @@ #define DMMAX 4096 /* largest potential swap allocation */ #ifndef USRIOSIZE -#define USRIOSIZE 128 +#define USRIOSIZE ((2*HPPA_PGALIAS)/CLBYTES) /* 2mb */ #endif /* @@ -141,4 +141,9 @@ #define MACHINE_NEW_NONCONTIG 1 /* defined this until we rely on vm */ #define PMAP_NEW +struct pmap_physseg { + struct pv_entry *pvent; +}; + #endif /* _MACHINE_VMPARAM_H_ */ + |