From owner-svn-src-stable@FreeBSD.ORG  Thu Apr  3 11:59:04 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@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 E605149C;
 Thu,  3 Apr 2014 11:59:04 +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 D244E260;
 Thu,  3 Apr 2014 11:59:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s33Bx4jo055564;
 Thu, 3 Apr 2014 11:59:04 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s33Bx4pg055563;
 Thu, 3 Apr 2014 11:59:04 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201404031159.s33Bx4pg055563@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Thu, 3 Apr 2014 11:59:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r264071 - stable/10/sys/dev/vt
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Apr 2014 11:59:05 -0000

Author: ray
Date: Thu Apr  3 11:59:04 2014
New Revision: 264071
URL: http://svnweb.freebsd.org/changeset/base/264071

Log:
  MFC r263809
  
  Fix crash on resume in vt(9).
  Statically allocated terminal window have not initialized callout handler, so we
  have to initialize it even for existing window if it is console window.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/dev/vt/vt_core.c

Modified: stable/10/sys/dev/vt/vt_core.c
==============================================================================
--- stable/10/sys/dev/vt/vt_core.c	Thu Apr  3 08:16:45 2014	(r264070)
+++ stable/10/sys/dev/vt/vt_core.c	Thu Apr  3 11:59:04 2014	(r264071)
@@ -1872,6 +1872,9 @@ vt_upgrade(struct vt_device *vd)
 		if (vw == NULL) {
 			/* New window. */
 			vw = vt_allocate_window(vd, i);
+		} else if (vw->vw_flags & VWF_CONSOLE) {
+			/* For existing console window. */
+			callout_init(&vw->vw_proc_dead_timer, 0);
 		}
 		if (i == VT_CONSWINDOW) {
 			/* Console window. */