svn commit: r264071 - stable/10/sys/dev/vt

[Aleksandr Rybalko]

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. */