Module Name: src
Committed By: skrll
Date: Wed Feb 26 07:48:29 UTC 2014
Modified Files:
src/sys/arch/arm/arm32: fault.c
Log Message:
Re-enable FSR_WRITE for armv6.
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 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.95 src/sys/arch/arm/arm32/fault.c:1.96
--- src/sys/arch/arm/arm32/fault.c:1.95 Tue Feb 25 22:18:09 2014
+++ src/sys/arch/arm/arm32/fault.c Wed Feb 26 07:48:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fault.c,v 1.95 2014/02/25 22:18:09 matt Exp $ */
+/* $NetBSD: fault.c,v 1.96 2014/02/26 07:48:29 skrll 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.95 2014/02/25 22:18:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.96 2014/02/26 07:48:29 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -412,11 +412,10 @@ data_abort_handler(trapframe_t *tf)
* Otherwise we need to disassemble the instruction responsible to
* determine if it was a write.
*/
- if (/* CPU_IS_ARMV6_P() || */ CPU_IS_ARMV7_P()) {
+ if (CPU_IS_ARMV6_P() || CPU_IS_ARMV7_P()) {
ftype = (fsr & FAULT_WRITE) ? VM_PROT_WRITE : VM_PROT_READ;
} else if (IS_PERMISSION_FAULT(fsr)) {
ftype = VM_PROT_WRITE;
- // KASSERTMSG(fsr & FAULT_WRITE, "fsr %#x", fsr);
} else {
#ifdef THUMB_CODE
/* Fast track the ARM case. */
@@ -436,7 +435,6 @@ data_abort_handler(trapframe_t *tf)
ftype = VM_PROT_WRITE;
else
ftype = VM_PROT_READ;
- // KASSERTMSG(ftype == (fsr & FAULT_WRITE) ? VM_PROT_WRITE : VM_PROT_READ, "fsr %#x insn %#x", fsr, insn);
}
else
#endif
@@ -452,7 +450,6 @@ data_abort_handler(trapframe_t *tf)
ftype = VM_PROT_READ | VM_PROT_WRITE;
else
ftype = VM_PROT_READ;
- // KASSERTMSG(ftype == (fsr & FAULT_WRITE) ? VM_PROT_WRITE : VM_PROT_READ, "fsr %#x insn %#x", fsr, insn);
}
}
