From owner-svn-src-head@FreeBSD.ORG  Wed Feb 12 19:59:31 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 797A2CD0;
 Wed, 12 Feb 2014 19:59:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 64FFC1782;
 Wed, 12 Feb 2014 19:59:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1CJxVxX061056;
 Wed, 12 Feb 2014 19:59:31 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1CJxV41061054;
 Wed, 12 Feb 2014 19:59:31 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201402121959.s1CJxV41061054@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Wed, 12 Feb 2014 19:59:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261808 - in head/sys/arm: arm include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Feb 2014 19:59:31 -0000

Author: ian
Date: Wed Feb 12 19:59:30 2014
New Revision: 261808
URL: http://svnweb.freebsd.org/changeset/base/261808

Log:
  Use the right symbols for determining arm architecture.  Include the
  necessary header file which has the new FAULT_WNR symbol defined in it.

Modified:
  head/sys/arm/arm/trap.c
  head/sys/arm/include/armreg.h

Modified: head/sys/arm/arm/trap.c
==============================================================================
--- head/sys/arm/arm/trap.c	Wed Feb 12 19:51:12 2014	(r261807)
+++ head/sys/arm/arm/trap.c	Wed Feb 12 19:59:30 2014	(r261808)
@@ -108,6 +108,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
+#include <machine/armreg.h>
 #include <machine/cpuconf.h>
 #include <machine/vmparam.h>
 #include <machine/frame.h>
@@ -393,7 +394,7 @@ data_abort_handler(struct trapframe *tf)
 	 * location, so we can deal with those quickly.  Otherwise we need to
 	 * disassemble the faulting instruction to determine if it was a write.
 	 */
-#ifdef _ARM_ARCH_6
+#if ARM_ARCH_6 || ARM_ARCH_7A
 	ftype = (fsr & FAULT_WNR) ? VM_PROT_READ | VM_PROT_WRITE : VM_PROT_READ;
 #else
 	if (IS_PERMISSION_FAULT(fsr))
@@ -411,8 +412,8 @@ data_abort_handler(struct trapframe *tf)
 			else
 				ftype = VM_PROT_READ;
 		}
-#endif
 	}
+#endif
 
 	/*
 	 * See if the fault is as a result of ref/mod emulation,

Modified: head/sys/arm/include/armreg.h
==============================================================================
--- head/sys/arm/include/armreg.h	Wed Feb 12 19:51:12 2014	(r261807)
+++ head/sys/arm/include/armreg.h	Wed Feb 12 19:59:30 2014	(r261808)
@@ -404,6 +404,8 @@
 #define FAULT_PERM_P    0x0f /* Permission -- Page */
 
 #define	FAULT_IMPRECISE	0x400	/* Imprecise exception (XSCALE) */
+#define	FAULT_EXTERNAL	0x400	/* External abort (armv6+) */
+#define	FAULT_WNR	0x800	/* Write-not-Read access (armv6+) */
 
 /*
  * Address of the vector page, low and high versions.