Author: dumbbell
Date: Mon Sep  8 08:44:50 2014
New Revision: 271253
URL: http://svnweb.freebsd.org/changeset/base/271253

Log:
  pause_sbt(): Take the cold path (ie. use DELAY()) if KDB is active
  
  This fixes a panic in the i915 driver when one uses debug.kdb.enter=1
  under vt(4).
  
  PR:           193269
  Reported by:  emaste@
  Submitted by: avg@
  MFC after:    3 days

Modified:
  head/sys/kern/kern_synch.c

Modified: head/sys/kern/kern_synch.c
==============================================================================
--- head/sys/kern/kern_synch.c  Mon Sep  8 08:25:33 2014        (r271252)
+++ head/sys/kern/kern_synch.c  Mon Sep  8 08:44:50 2014        (r271253)
@@ -362,7 +362,7 @@ pause_sbt(const char *wmesg, sbintime_t 
        if (sbt == 0)
                sbt = tick_sbt;
 
-       if (cold) {
+       if (cold || kdb_active) {
                /*
                 * We delay one second at a time to avoid overflowing the
                 * system specific DELAY() function(s):
_______________________________________________
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