From owner-svn-src-user@FreeBSD.ORG  Wed Nov 25 10:43:03 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A9E95106568B;
	Wed, 25 Nov 2009 10:43:03 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 98DBD8FC19;
	Wed, 25 Nov 2009 10:43:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAPAh3RY046463;
	Wed, 25 Nov 2009 10:43:03 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAPAh3g6046462;
	Wed, 25 Nov 2009 10:43:03 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200911251043.nAPAh3g6046462@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Wed, 25 Nov 2009 10:43:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199790 - user/ed/newcons/sys/dev/vt
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Nov 2009 10:43:03 -0000

Author: ed
Date: Wed Nov 25 10:43:03 2009
New Revision: 199790
URL: http://svn.freebsd.org/changeset/base/199790

Log:
  Use atomic increments for vt_unit.
  
  It's not likely that multiple allocations of vt devices will ever occur
  at the same time, but if it would happen, the results are very scary.

Modified:
  user/ed/newcons/sys/dev/vt/vt_core.c

Modified: user/ed/newcons/sys/dev/vt/vt_core.c
==============================================================================
--- user/ed/newcons/sys/dev/vt/vt_core.c	Wed Nov 25 05:42:54 2009	(r199789)
+++ user/ed/newcons/sys/dev/vt/vt_core.c	Wed Nov 25 10:43:03 2009	(r199790)
@@ -599,7 +599,7 @@ vtterm_cnprobe(struct terminal *tm, stru
 		return;
 	}
 
-	vd->vd_unit = vt_unit++;
+	vd->vd_unit = atomic_fetchadd_int(&vt_unit, 1);
 	sprintf(cp->cn_name, "ttyv%r", VT_UNIT(vw));
 
 	if (!(vd->vd_flags & VDF_TEXTMODE))
@@ -1032,7 +1032,7 @@ vt_allocate(struct vt_driver *drv, void 
 	vd = malloc(sizeof *vd, M_VT, M_WAITOK|M_ZERO);
 	vd->vd_driver = drv;
 	vd->vd_softc = softc;
-	vd->vd_unit = vt_unit++;
+	vd->vd_unit = atomic_fetchadd_int(&vt_unit, 1);
 	vd->vd_flags = VDF_INVALID;
 	vd->vd_driver->vd_init(vd);