diff options
| author |   deraadt <deraadt@openbsd.org> | 2013-03-25 19:57:41 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2013-03-25 19:57:41 +0000 |
| commit | 0543ead7471bc670bc20b88cebb2f6853c37e3c3 (patch) | |
| tree | 6bd7a14122513534dff9597ba298ee6bcfa2f114 | |
| parent | Use the new rasops multiple screen support to provide proper virtual (diff) | |
| download | wireguard-openbsd-0543ead7471bc670bc20b88cebb2f6853c37e3c3.tar.xz wireguard-openbsd-0543ead7471bc670bc20b88cebb2f6853c37e3c3.zip | |
PGSHIFT -> PAGE_SHIFT
| -rw-r--r-- | sys/arch/alpha/include/pmap.h | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/include/cpufunc.h | 6 | ||||
| -rw-r--r-- | sys/arch/mips64/include/pte.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/alpha/include/pmap.h b/sys/arch/alpha/include/pmap.h index 233932f1798..10ae6b9ccac 100644 --- a/sys/arch/alpha/include/pmap.h +++ b/sys/arch/alpha/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.26 2011/11/16 20:50:18 deraadt Exp $ */ +/* $OpenBSD: pmap.h,v 1.27 2013/03/25 20:03:02 deraadt Exp $ */ /* $NetBSD: pmap.h,v 1.37 2000/11/19 03:16:35 thorpej Exp $ */ /*- @@ -209,7 +209,7 @@ int pmap_emulate_reference(struct proc *p, vaddr_t v, int user, int type); int pmap_uses_prom_console(void); #endif -#define pmap_pte_pa(pte) (PG_PFNUM(*(pte)) << PGSHIFT) +#define pmap_pte_pa(pte) (PG_PFNUM(*(pte)) << PAGE_SHIFT) #define pmap_pte_prot(pte) (*(pte) & PG_PROT) #define pmap_pte_w(pte) (*(pte) & PG_WIRED) #define pmap_pte_v(pte) (*(pte) & PG_V) diff --git a/sys/arch/hppa/include/cpufunc.h b/sys/arch/hppa/include/cpufunc.h index e91cdd9680f..9c7efe2281e 100644 --- a/sys/arch/hppa/include/cpufunc.h +++ b/sys/arch/hppa/include/cpufunc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpufunc.h,v 1.27 2005/04/07 00:19:28 mickey Exp $ */ +/* $OpenBSD: cpufunc.h,v 1.28 2013/03/25 19:59:22 deraadt Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -60,8 +60,8 @@ #include <machine/psl.h> #include <machine/pte.h> -#define tlbbtop(b) ((b) >> (PGSHIFT - 5)) -#define tlbptob(p) ((p) << (PGSHIFT - 5)) +#define tlbbtop(b) ((b) >> (PAGE_SHIFT - 5)) +#define tlbptob(p) ((p) << (PAGE_SHIFT - 5)) #define hptbtop(b) ((b) >> 17) diff --git a/sys/arch/mips64/include/pte.h b/sys/arch/mips64/include/pte.h index 377ea98fd28..5759fe58bde 100644 --- a/sys/arch/mips64/include/pte.h +++ b/sys/arch/mips64/include/pte.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pte.h,v 1.15 2012/09/29 21:37:03 miod Exp $ */ +/* $OpenBSD: pte.h,v 1.16 2013/03/25 19:57:41 deraadt Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -142,9 +142,9 @@ typedef u_int32_t pt_entry_t; /* Mips page table entry */ /* Kernel virtual address to page table entry */ #define kvtopte(va) \ - (Sysmap + (((vaddr_t)(va) - VM_MIN_KERNEL_ADDRESS) >> PGSHIFT)) + (Sysmap + (((vaddr_t)(va) - VM_MIN_KERNEL_ADDRESS) >> PAGE_SHIFT)) /* User virtual address to pte page entry */ -#define uvtopte(adr) (((adr) >> PGSHIFT) & (NPTEPG -1)) +#define uvtopte(adr) (((adr) >> PAGE_SHIFT) & (NPTEPG -1)) extern pt_entry_t *Sysmap; /* kernel pte table */ extern u_int Sysmapsize; /* number of pte's in Sysmap */ |