From owner-svn-src-all@FreeBSD.ORG  Mon Sep  8 08:44:50 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DADD6D06;
 Mon,  8 Sep 2014 08:44:50 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C6A151AE5;
 Mon,  8 Sep 2014 08:44:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s888ioZo036468;
 Mon, 8 Sep 2014 08:44:50 GMT (envelope-from dumbbell@FreeBSD.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s888iojU036467;
 Mon, 8 Sep 2014 08:44:50 GMT (envelope-from dumbbell@FreeBSD.org)
Message-Id: <201409080844.s888iojU036467@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to
 dumbbell@FreeBSD.org using -f
From: Jean-Sebastien Pedron <dumbbell@FreeBSD.org>
Date: Mon, 8 Sep 2014 08:44:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r271253 - head/sys/kern
X-SVN-Group: head
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.18-1
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: Mon, 08 Sep 2014 08:44:51 -0000

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):