From owner-svn-src-head@FreeBSD.ORG  Thu May 22 09:31:19 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 27026DF7;
 Thu, 22 May 2014 09:31:19 +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 14B032D02;
 Thu, 22 May 2014 09:31:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4M9VI2w044540;
 Thu, 22 May 2014 09:31:18 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4M9VIJ6044539;
 Thu, 22 May 2014 09:31:18 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201405220931.s4M9VIJ6044539@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Thu, 22 May 2014 09:31:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r266540 - head/sys/dev/vt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 May 2014 09:31:19 -0000

Author: ray
Date: Thu May 22 09:31:18 2014
New Revision: 266540
URL: http://svnweb.freebsd.org/changeset/base/266540

Log:
  Proper fix of VT_LOCKSWITCH ioctl.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: head/sys/dev/vt/vt_core.c
==============================================================================
--- head/sys/dev/vt/vt_core.c	Thu May 22 09:28:36 2014	(r266539)
+++ head/sys/dev/vt/vt_core.c	Thu May 22 09:31:18 2014	(r266540)
@@ -1815,9 +1815,9 @@ skip_thunk:
 	case VT_LOCKSWITCH:
 		/* TODO: Check current state, switching can be in progress. */
 		if ((*(int *)data) == 0x01)
-			vw->vw_flags &= ~VWF_VTYLOCK;
-		else if ((*(int *)data) == 0x02)
 			vw->vw_flags |= VWF_VTYLOCK;
+		else if ((*(int *)data) == 0x02)
+			vw->vw_flags &= ~VWF_VTYLOCK;
 		else
 			return (EINVAL);
 		return (0);