summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2016-12-23 12:38:17 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2016-12-23 12:38:17 +0000
commitf73f95516714dc4b7cb8300d88289044163f0e04 (patch)
tree144a9e81fd56180baeab400c95d19feccd330735 /sys
parentc92c8dcf03bb9d2163095683aad621a3b290a936 (diff)
Tweaks suggested by miod@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/mips64/include/vmparam.h4
-rw-r--r--sys/arch/mips64/mips64/pmap.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/mips64/include/vmparam.h b/sys/arch/mips64/include/vmparam.h
index 672e2042313..eef1c18f286 100644
--- a/sys/arch/mips64/include/vmparam.h
+++ b/sys/arch/mips64/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.28 2016/12/22 15:33:36 visa Exp $ */
+/* $OpenBSD: vmparam.h,v 1.29 2016/12/23 12:38:16 visa Exp $ */
/* $NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp $ */
/*
@@ -102,7 +102,7 @@
#define VM_MIN_KERNEL_ADDRESS ((vaddr_t)0xc000000000000000L)
#define VM_MAX_KERNEL_ADDRESS ((vaddr_t)0xc000000040000000L)
-/* map PIE below 256GB (non-pie link address) to avoid mmap pressure */
+/* map PIE into approximately the first quarter of user va space */
#define VM_PIE_MIN_ADDR PAGE_SIZE
#define VM_PIE_MAX_ADDR (0x4000000000UL)
diff --git a/sys/arch/mips64/mips64/pmap.c b/sys/arch/mips64/mips64/pmap.c
index ac77c453ba4..d59774cb27a 100644
--- a/sys/arch/mips64/mips64/pmap.c
+++ b/sys/arch/mips64/mips64/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.96 2016/12/22 15:33:36 visa Exp $ */
+/* $OpenBSD: pmap.c,v 1.97 2016/12/23 12:38:16 visa Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -613,8 +613,10 @@ pmap_collect(pmap_t pmap)
m++;
n = 0;
for (k = 0; k < NPTEPG; k++) {
- if (pte[k] & PG_V)
+ if (pte[k] & PG_V) {
n++;
+ break;
+ }
}
if (n == 0) {
pmpg = pde[j];