From owner-svn-src-all@FreeBSD.ORG  Wed Apr  8 12:54:33 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 13B651065678;
	Wed,  8 Apr 2009 12:54:33 +0000 (UTC) (envelope-from raj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0090C8FC0C;
	Wed,  8 Apr 2009 12:54:33 +0000 (UTC) (envelope-from raj@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n38CsWO1059522;
	Wed, 8 Apr 2009 12:54:32 GMT (envelope-from raj@svn.freebsd.org)
Received: (from raj@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n38CsWRx059521;
	Wed, 8 Apr 2009 12:54:32 GMT (envelope-from raj@svn.freebsd.org)
Message-Id: <200904081254.n38CsWRx059521@svn.freebsd.org>
From: Rafal Jaworowski <raj@FreeBSD.org>
Date: Wed, 8 Apr 2009 12:54:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190844 - head/sys/arm/arm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 08 Apr 2009 12:54:36 -0000

Author: raj
Date: Wed Apr  8 12:54:32 2009
New Revision: 190844
URL: http://svn.freebsd.org/changeset/base/190844

Log:
  Properly handle KDB entry in fatal abort. This lets KDB_UNATTENDED work on ARM.
  
  Submitted by:	Grzegorz Bernacki gjb ! semihalf dot com

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

Modified: head/sys/arm/arm/trap.c
==============================================================================
--- head/sys/arm/arm/trap.c	Wed Apr  8 12:52:05 2009	(r190843)
+++ head/sys/arm/arm/trap.c	Wed Apr  8 12:54:32 2009	(r190844)
@@ -520,7 +520,8 @@ dab_fatal(trapframe_t *tf, u_int fsr, u_
 	printf(", pc =%08x\n\n", tf->tf_pc);
 
 #ifdef KDB
-	kdb_trap(fsr, 0, tf);
+	if (debugger_on_panic || kdb_active)
+		kdb_trap(fsr, 0, tf);
 #endif
 	panic("Fatal abort");
 	/*NOTREACHED*/