From owner-svn-src-all@FreeBSD.ORG  Mon Mar 17 16:45:28 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 F0B8531A;
 Mon, 17 Mar 2014 16:45:28 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DD105B6B;
 Mon, 17 Mar 2014 16:45:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2HGjSTG046421;
 Mon, 17 Mar 2014 16:45:28 GMT (envelope-from royger@svn.freebsd.org)
Received: (from royger@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2HGjSC7046420;
 Mon, 17 Mar 2014 16:45:28 GMT (envelope-from royger@svn.freebsd.org)
Message-Id: <201403171645.s2HGjSC7046420@svn.freebsd.org>
From: Roger Pau Monné <royger@FreeBSD.org>
Date: Mon, 17 Mar 2014 16:45:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r263268 - head/sys/dev/xen/console
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.17
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, 17 Mar 2014 16:45:29 -0000

Author: royger
Date: Mon Mar 17 16:45:28 2014
New Revision: 263268
URL: http://svnweb.freebsd.org/changeset/base/263268

Log:
  xen: fix usage of db_active in xen console
  
  Replace usage of db_active in Xen console with kdb_active.
  
  Reported by: Andrzej Tobola <ato@iem.pw.edu.pl>
  Approved by: gibbs
  Sponsored by: Citrix Systems R&D

Modified:
  head/sys/dev/xen/console/console.c

Modified: head/sys/dev/xen/console/console.c
==============================================================================
--- head/sys/dev/xen/console/console.c	Mon Mar 17 16:10:42 2014	(r263267)
+++ head/sys/dev/xen/console/console.c	Mon Mar 17 16:45:28 2014	(r263268)
@@ -247,13 +247,12 @@ xc_cnputc(struct consdev *dev, int c)
 		xc_cnputc_domu(dev, c);
 }
 
-extern int db_active;
 static boolean_t
 xcons_putc(int c)
 {
 	int force_flush = xc_mute ||
 #ifdef DDB
-		db_active ||
+		kdb_active ||
 #endif
 		panicstr;	/* we're not gonna recover, so force
 				 * flush