From owner-svn-src-all@freebsd.org Mon Feb 22 12:57:10 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A409AB0DDA; Mon, 22 Feb 2016 12:57:10 +0000 (UTC) (envelope-from skra@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F156313BC; Mon, 22 Feb 2016 12:57:09 +0000 (UTC) (envelope-from skra@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1MCv8FN057376; Mon, 22 Feb 2016 12:57:08 GMT (envelope-from skra@FreeBSD.org) Received: (from skra@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1MCv8Q8057375; Mon, 22 Feb 2016 12:57:08 GMT (envelope-from skra@FreeBSD.org) Message-Id: <201602221257.u1MCv8Q8057375@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: skra set sender to skra@FreeBSD.org using -f From: Svatopluk Kraus Date: Mon, 22 Feb 2016 12:57:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r295887 - head/sys/arm/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2016 12:57:10 -0000 Author: skra Date: Mon Feb 22 12:57:08 2016 New Revision: 295887 URL: https://svnweb.freebsd.org/changeset/base/295887 Log: Remove armv6 specific part from armv4 specific file and update comment. No functional change. Modified: head/sys/arm/arm/trap-v4.c Modified: head/sys/arm/arm/trap-v4.c ============================================================================== --- head/sys/arm/arm/trap-v4.c Mon Feb 22 12:28:23 2016 (r295886) +++ head/sys/arm/arm/trap-v4.c Mon Feb 22 12:57:08 2016 (r295887) @@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include @@ -312,16 +311,13 @@ abort_handler(struct trapframe *tf, int } /* - * 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 ftype = VM_PROT_READ; } } -#endif /* * See if the fault is as a result of ref/mod emulation,