[src/trunk]: src/sys/arch/arm/arm32 Re-enable FSR_WRITE for armv6.

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b99f08abc267
branches:  trunk
changeset: 327057:b99f08abc267
user:      skrll <skrll%NetBSD.org@localhost>
date:      Wed Feb 26 07:48:29 2014 +0000

description:
Re-enable FSR_WRITE for armv6.

diffstat:

 sys/arch/arm/arm32/fault.c |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r e101102188a5 -r b99f08abc267 sys/arch/arm/arm32/fault.c
--- a/sys/arch/arm/arm32/fault.c        Wed Feb 26 05:51:11 2014 +0000
+++ b/sys/arch/arm/arm32/fault.c        Wed Feb 26 07:48:29 2014 +0000
@@ -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 @@
         * 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 @@
                                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 @@
                                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);
                }
        }