Module Name: src
Committed By: matt
Date: Mon Feb 18 05:14:13 UTC 2013
Modified Files:
src/sys/arch/arm/arm32: fault.c
Log Message:
Supply VM_PROT_EXECUTE to pmap_fault_fixup when trying to fixup prefetch
aborts.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/arm/arm32/fault.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/fault.c
diff -u src/sys/arch/arm/arm32/fault.c:1.87 src/sys/arch/arm/arm32/fault.c:1.88
--- src/sys/arch/arm/arm32/fault.c:1.87 Mon Dec 10 01:37:30 2012
+++ src/sys/arch/arm/arm32/fault.c Mon Feb 18 05:14:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fault.c,v 1.87 2012/12/10 01:37:30 matt Exp $ */
+/* $NetBSD: fault.c,v 1.88 2013/02/18 05:14:13 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
#include "opt_kgdb.h"
#include <sys/types.h>
-__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.87 2012/12/10 01:37:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.88 2013/02/18 05:14:13 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -832,7 +832,7 @@ prefetch_abort_handler(trapframe_t *tf)
#ifdef DEBUG
last_fault_code = -1;
#endif
- if (pmap_fault_fixup(map->pmap, va, VM_PROT_READ, 1)) {
+ if (pmap_fault_fixup(map->pmap, va, VM_PROT_READ|VM_PROT_EXECUTE, 1)) {
UVMHIST_LOG (maphist, " <- emulated", 0, 0, 0, 0);
goto out;
}
