From owner-svn-src-all@freebsd.org  Mon Aug  3 14:58:47 2015
Return-Path: <owner-svn-src-all@freebsd.org>
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 987319AE05F;
 Mon,  3 Aug 2015 14:58:47 +0000 (UTC) (envelope-from zbb@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 89F9F90C;
 Mon,  3 Aug 2015 14:58:47 +0000 (UTC) (envelope-from zbb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t73Ewl0E055904;
 Mon, 3 Aug 2015 14:58:47 GMT (envelope-from zbb@FreeBSD.org)
Received: (from zbb@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t73Ewlo3055903;
 Mon, 3 Aug 2015 14:58:47 GMT (envelope-from zbb@FreeBSD.org)
Message-Id: <201508031458.t73Ewlo3055903@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: zbb set sender to zbb@FreeBSD.org
 using -f
From: Zbigniew Bodek <zbb@FreeBSD.org>
Date: Mon, 3 Aug 2015 14:58:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286233 - head/sys/arm64/arm64
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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Aug 2015 14:58:47 -0000

Author: zbb
Date: Mon Aug  3 14:58:46 2015
New Revision: 286233
URL: https://svnweb.freebsd.org/changeset/base/286233

Log:
  Add missing exception number to EL0 sync. abort on ARM64
  
  When doing a data abort from userland it is possible to get
  more than one data abort inside the same exception level.
  Add an appropriate exception number to allow nesting of
  data_abort handler for EL0.
  
  Reviewed by:   andrew
  Obtained from: Semihalf
  Sponsored by:  The FreeBSD Foundation
  Differential Revision: https://reviews.freebsd.org/D3276

Modified:
  head/sys/arm64/arm64/trap.c

Modified: head/sys/arm64/arm64/trap.c
==============================================================================
--- head/sys/arm64/arm64/trap.c	Mon Aug  3 14:31:06 2015	(r286232)
+++ head/sys/arm64/arm64/trap.c	Mon Aug  3 14:58:46 2015	(r286233)
@@ -329,6 +329,7 @@ do_el0_sync(struct trapframe *frame)
 		break;
 	case EXCP_INSN_ABORT_L:
 	case EXCP_DATA_ABORT_L:
+	case EXCP_DATA_ABORT:
 		data_abort(frame, esr, 1);
 		break;
 	default: