From owner-svn-src-releng@FreeBSD.ORG  Mon Oct 20 03:17:49 2014
Return-Path: <owner-svn-src-releng@FreeBSD.ORG>
Delivered-To: svn-src-releng@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 958E8C1E;
 Mon, 20 Oct 2014 03:17:49 +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 820D9E1C;
 Mon, 20 Oct 2014 03:17:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9K3Hnpg043071;
 Mon, 20 Oct 2014 03:17:49 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9K3Hnfe043070;
 Mon, 20 Oct 2014 03:17:49 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201410200317.s9K3Hnfe043070@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 20 Oct 2014 03:17:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r273300 - releng/10.1/sys/dev/vt
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng/>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Oct 2014 03:17:49 -0000

Author: emaste
Date: Mon Oct 20 03:17:48 2014
New Revision: 273300
URL: https://svnweb.freebsd.org/changeset/base/273300

Log:
  MFS10 r273296 (r273219 in HEAD):
  
    Do nothing in vt_upgrade if there is no vt driver
  
    Previously, if no drivers attached at boot we would panic with
    "vtbuf_fill_locked begin.tp_row 0 must be < screen height 0".
  
  PR:		192248
  Approved by:	re

Modified:
  releng/10.1/sys/dev/vt/vt_core.c
Directory Properties:
  releng/10.1/   (props changed)

Modified: releng/10.1/sys/dev/vt/vt_core.c
==============================================================================
--- releng/10.1/sys/dev/vt/vt_core.c	Mon Oct 20 02:57:30 2014	(r273299)
+++ releng/10.1/sys/dev/vt/vt_core.c	Mon Oct 20 03:17:48 2014	(r273300)
@@ -2491,6 +2491,8 @@ vt_upgrade(struct vt_device *vd)
 
 	if (!vty_enabled(VTY_VT))
 		return;
+	if (main_vd->vd_driver == NULL)
+		return;
 
 	for (i = 0; i < VT_MAXWINDOWS; i++) {
 		vw = vd->vd_windows[i];