Date: Sat, 14 Dec 2013 00:57:05 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> 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 Message-ID: <201312140057.rBE0v6Px010049@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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*/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312140057.rBE0v6Px010049>