svn commit: r271682 - head/sys/dev/vt

[Jean-Sebastien Pedron]

Author: dumbbell
Date: Tue Sep 16 17:42:37 2014
New Revision: 271682
URL: http://svnweb.freebsd.org/changeset/base/271682

Log:
  vt(4): Fix a LOR which occurs during a call to vt_upgrade()
  
  Reported by:	kib@
  Review:		https://reviews.freebsd.org/D785
  Reviewed by:	ray@
  Approved by:	ray@
  MFC after:	2 days

Modified:
  head/sys/dev/vt/vt_core.c

Modified: head/sys/dev/vt/vt_core.c
==============================================================================
--- head/sys/dev/vt/vt_core.c	Tue Sep 16 17:21:06 2014	(r271681)
+++ head/sys/dev/vt/vt_core.c	Tue Sep 16 17:42:37 2014	(r271682)
@@ -2405,7 +2405,6 @@ vt_allocate(struct vt_driver *drv, void 
 		    main_vd->vd_driver->vd_name, drv->vd_name);
 	}
 	vd = main_vd;
-	VT_LOCK(vd);
 
 	if (vd->vd_flags & VDF_ASYNC) {
 		/* Stop vt_flush periodic task. */
@@ -2421,6 +2420,7 @@ vt_allocate(struct vt_driver *drv, void 
 	 * Reset VDF_TEXTMODE flag, driver who require that flag (vt_vga) will
 	 * set it.
 	 */
+	VT_LOCK(vd);
 	vd->vd_flags &= ~VDF_TEXTMODE;
 
 	vd->vd_driver = drv;