From eb21eee06e1cb73a1a302dd3017f02380fe4ca25 Mon Sep 17 00:00:00 2001
From: Svatopluk Kraus <skra@FreeBSD.org>
Date: Mon, 22 Feb 2016 12:57:08 +0000
Subject: [PATCH] Remove armv6 specific part from armv4 specific file and
 update comment. No functional change.

---
 sys/arm/arm/trap-v4.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/sys/arm/arm/trap-v4.c b/sys/arm/arm/trap-v4.c
index eb4d68304b33..024c911dc1f7 100644
--- a/sys/arm/arm/trap-v4.c
+++ b/sys/arm/arm/trap-v4.c
@@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
-#include <machine/acle-compat.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <machine/machdep.h>
@@ -312,16 +311,13 @@ abort_handler(struct trapframe *tf, int type)
 	}
 
 	/*
-	 * We need to know whether the page should be mapped as R or R/W.  On
-	 * armv6 and later the fault status register indicates whether the
-	 * access was a read or write.  Prior to armv6, we know that a
-	 * permission fault can only be the result of a write to a read-only
-	 * location, so we can deal with those quickly.  Otherwise we need to
-	 * disassemble the faulting instruction to determine if it was a write.
+	 * We need to know whether the page should be mapped as R or R/W.
+	 * On armv4, the fault status register does not indicate whether
+	 * the access was a read or write.  We know that a permission fault
+	 * can only be the result of a write to a read-only location, so we
+	 * can deal with those quickly.  Otherwise we need to disassemble
+	 * the faulting instruction to determine if it was a write.
 	 */
-#if __ARM_ARCH >= 6
-	ftype = (fsr & FAULT_WNR) ? VM_PROT_READ | VM_PROT_WRITE : VM_PROT_READ;
-#else
 	if (IS_PERMISSION_FAULT(fsr))
 		ftype = VM_PROT_WRITE;
 	else {
@@ -338,7 +334,6 @@ abort_handler(struct trapframe *tf, int type)
 				ftype = VM_PROT_READ;
 		}
 	}
-#endif
 
 	/*
 	 * See if the fault is as a result of ref/mod emulation,