From owner-svn-src-stable-10@FreeBSD.ORG  Fri Feb 13 23:32:04 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8FBAB36F;
 Fri, 13 Feb 2015 23:32:04 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 79E82C05;
 Fri, 13 Feb 2015 23:32:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1DNW41g065558;
 Fri, 13 Feb 2015 23:32:04 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1DNW4YC065557;
 Fri, 13 Feb 2015 23:32:04 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201502132332.t1DNW4YC065557@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Fri, 13 Feb 2015 23:32:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r278731 - stable/10/sys/arm/arm
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Feb 2015 23:32:04 -0000

Author: ian
Date: Fri Feb 13 23:32:03 2015
New Revision: 278731
URL: https://svnweb.freebsd.org/changeset/base/278731

Log:
  MFC r277523:  Add last_fault_code when DEBUG is defined.

Modified:
  stable/10/sys/arm/arm/trap-v6.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/arm/trap-v6.c
==============================================================================
--- stable/10/sys/arm/arm/trap-v6.c	Fri Feb 13 23:30:48 2015	(r278730)
+++ stable/10/sys/arm/arm/trap-v6.c	Fri Feb 13 23:32:03 2015	(r278731)
@@ -67,6 +67,10 @@ __FBSDID("$FreeBSD$");
 
 extern char fusubailout[];
 
+#ifdef DEBUG
+int last_fault_code;	/* For the benefit of pmap_fault_fixup() */
+#endif
+
 struct ksig {
 	int sig;
 	u_long code;
@@ -457,6 +461,10 @@ abort_handler(struct trapframe *tf, int 
 	if (prefetch)
 		ftype |= VM_PROT_EXECUTE;
 
+#ifdef DEBUG
+	last_fault_code = fsr;
+#endif
+
 #ifndef ARM_NEW_PMAP
 	if (pmap_fault_fixup(vmspace_pmap(td->td_proc->p_vmspace), va, ftype,
 	    usermode)) {