From owner-svn-src-all@FreeBSD.ORG  Sat Dec 14 00:57:06 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 3B464633;
 Sat, 14 Dec 2013 00:57:06 +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 262EC10F4;
 Sat, 14 Dec 2013 00:57:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBE0v6Ie010050;
 Sat, 14 Dec 2013 00:57:06 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBE0v6Px010049;
 Sat, 14 Dec 2013 00:57:06 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201312140057.rBE0v6Px010049@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Sat, 14 Dec 2013 00:57:05 +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: r259373 - 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-all@freebsd.org
X-Mailman-Version: 2.1.17
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: Sat, 14 Dec 2013 00:57:06 -0000

Author: ian
Date: Sat Dec 14 00:57:05 2013
New Revision: 259373
URL: http://svnweb.freebsd.org/changeset/base/259373

Log:
  MFC r258240:
  
    In the data abort handler, don't panic if kdb is available and says it
    handled the condition.

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

Modified: stable/10/sys/arm/arm/trap.c
==============================================================================
--- stable/10/sys/arm/arm/trap.c	Sat Dec 14 00:55:34 2013	(r259372)
+++ stable/10/sys/arm/arm/trap.c	Sat Dec 14 00:57:05 2013	(r259373)
@@ -528,7 +528,8 @@ dab_fatal(struct trapframe *tf, u_int fs
 
 #ifdef KDB
 	if (debugger_on_panic || kdb_active)
-		kdb_trap(fsr, 0, tf);
+		if (kdb_trap(fsr, 0, tf))
+			return (0);
 #endif
 	panic("Fatal abort");
 	/*NOTREACHED*/