Module Name: src
Committed By: ad
Date: Sun Apr 19 21:24:36 UTC 2020
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
PR port-arm/55186: tests crash arm pmap
pmap_clearbit(): take execbits into account in the fastpath.
To generate a diff of this commit:
cvs rdiff -u -r1.410 -r1.411 src/sys/arch/arm/arm32/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.410 src/sys/arch/arm/arm32/pmap.c:1.411
--- src/sys/arch/arm/arm32/pmap.c:1.410 Sun Apr 19 19:36:49 2020
+++ src/sys/arch/arm/arm32/pmap.c Sun Apr 19 21:24:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.410 2020/04/19 19:36:49 kre Exp $ */
+/* $NetBSD: pmap.c,v 1.411 2020/04/19 21:24:36 ad Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -192,7 +192,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.410 2020/04/19 19:36:49 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.411 2020/04/19 21:24:36 ad Exp $");
#include <sys/atomic.h>
#include <sys/param.h>
@@ -2376,7 +2376,7 @@ pmap_clearbit(struct vm_page_md *md, pad
/*
* Anything to do?
*/
- if ((oflags & maskbits) == 0) {
+ if ((oflags & maskbits) == 0 && execbits == 0) {
pv = SLIST_NEXT(pv, pv_link);
continue;
}
