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*/
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to