From owner-p4-projects@FreeBSD.ORG  Tue Sep 30 19:28:44 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 9A98EBF8; Tue, 30 Sep 2014 19:28:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5BA3ABF6
 for <perforce@freebsd.org>; Tue, 30 Sep 2014 19:28:44 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682: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 47CD5E1E
 for <perforce@freebsd.org>; Tue, 30 Sep 2014 19:28:44 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8UJSiKe087465
 for <perforce@freebsd.org>; Tue, 30 Sep 2014 19:28:44 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8UJSieX087462
 for perforce@freebsd.org; Tue, 30 Sep 2014 19:28:44 GMT
 (envelope-from jhb@freebsd.org)
Date: Tue, 30 Sep 2014 19:28:44 GMT
Message-Id: <201409301928.s8UJSieX087462@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1200967 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Sep 2014 19:28:44 -0000

http://p4web.freebsd.org/@@1200967?ac=10

Change 1200967 by jhb@jhb_jhbbsd on 2014/09/30 19:27:58

	A patch I posted to the lists that probably isn't needed.  It
	tries to make agp handle multiple agp devices sanely, but that
	shouldn't really happen.

Affected files ...

.. //depot/projects/smpng/sys/dev/agp/agp.c#20 edit

Differences ...

==== //depot/projects/smpng/sys/dev/agp/agp.c#20 (text+ko) ====

@@ -212,6 +212,7 @@
 agp_generic_attach(device_t dev)
 {
 	struct agp_softc *sc = device_get_softc(dev);
+	struct cdev *cdev;
 	int i;
 	u_int memsize;
 
@@ -232,7 +233,7 @@
 
 	/*
 	 * Work out an upper bound for agp memory allocation. This
-	 * uses a heurisitc table from the Linux driver.
+	 * uses a heuristic table from the Linux driver.
 	 */
 	memsize = ptoa(realmem) >> 20;
 	for (i = 0; i < agp_max_size; i++) {
@@ -257,8 +258,9 @@
 	sc->as_nextid = 1;
 
 	sc->as_devnode = make_dev(&agp_cdevsw,
-	    0, UID_ROOT, GID_WHEEL, 0600, "agpgart");
+	    0, UID_ROOT, GID_WHEEL, 0600, "%s", device_get_nameunit(dev));
 	sc->as_devnode->si_drv1 = dev;
+	make_dev_alias_p(MAKEDEV_CHECKNAME, &cdev, sc->as_devnode,  "agpgart");
 
 	return 0;
 }