summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2013-03-25 19:33:12 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2013-03-25 19:33:12 +0000
commit68fa456fe4131bdfe8adfcaf77899390ad29ca04 (patch)
tree9ced66f831a76ab61b97650df1443131e859b982
parent205b07be95f8356b12a8b7e321d7e246240f0cb8 (diff)
PGSHIFT -> PAGE_SHIFT
-rw-r--r--sys/arch/i386/include/pmap.h4
-rw-r--r--sys/arch/i386/include/vmparam.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/i386/include/pmap.h b/sys/arch/i386/include/pmap.h
index 884c8b896dc..1c1e3783e50 100644
--- a/sys/arch/i386/include/pmap.h
+++ b/sys/arch/i386/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.60 2013/03/23 16:12:23 deraadt Exp $ */
+/* $OpenBSD: pmap.h,v 1.61 2013/03/25 19:32:52 deraadt Exp $ */
/* $NetBSD: pmap.h,v 1.44 2000/04/24 17:18:18 thorpej Exp $ */
/*
@@ -203,7 +203,7 @@
* pdei/ptei: generate index into PDP/PTP from a VA
*/
#define pdei(VA) (((VA) & PD_MASK) >> PDSHIFT)
-#define ptei(VA) (((VA) & PT_MASK) >> PGSHIFT)
+#define ptei(VA) (((VA) & PT_MASK) >> PAGE_SHIFT)
/*
* PTP macros:
diff --git a/sys/arch/i386/include/vmparam.h b/sys/arch/i386/include/vmparam.h
index 48823fc2bd7..965dc966841 100644
--- a/sys/arch/i386/include/vmparam.h
+++ b/sys/arch/i386/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.50 2013/03/23 16:12:23 deraadt Exp $ */
+/* $OpenBSD: vmparam.h,v 1.51 2013/03/25 19:33:11 deraadt Exp $ */
/* $NetBSD: vmparam.h,v 1.15 1994/10/27 04:16:34 cgd Exp $ */
/*-
@@ -106,7 +106,7 @@
#define VM_MIN_ADDRESS ((vaddr_t)PAGE_SIZE)
#define VM_MAXUSER_ADDRESS ((vaddr_t)((PDSLOT_PTE<<PDSHIFT) - (2 * PAGE_SIZE)))
#define VM_MAX_ADDRESS ((vaddr_t)((PDSLOT_PTE<<PDSHIFT) + \
- (PDSLOT_PTE<<PGSHIFT)))
+ (PDSLOT_PTE<<PAGE_SHIFT)))
#define VM_MIN_KERNEL_ADDRESS ((vaddr_t)KERNBASE)
#define VM_MAX_KERNEL_ADDRESS ((vaddr_t)(PDSLOT_APTE<<PDSHIFT))