From owner-p4-projects@FreeBSD.ORG  Tue Nov 11 14:10:36 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F2B2B16A4D0; Tue, 11 Nov 2003 14:10:35 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CE3D216A4CE
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 14:10:35 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DC54C43FE1
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 14:10:34 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hABMAYXJ006326
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 14:10:34 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hABMAY0F006323
	for perforce@freebsd.org; Tue, 11 Nov 2003 14:10:34 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Tue, 11 Nov 2003 14:10:34 -0800 (PST)
Message-Id: <200311112210.hABMAY0F006323@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 42052 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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, 11 Nov 2003 22:10:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=42052

Change 42052 by jhb@jhb_blue on 2003/11/11 14:09:38

	IFC @42051.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_turnstile.c#2 delete
.. //depot/projects/smpng/sys/pci/agp.c#16 integrate
.. //depot/projects/smpng/sys/pci/agp_ali.c#7 integrate

Differences ...

==== //depot/projects/smpng/sys/pci/agp.c#16 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pci/agp.c,v 1.33 2003/10/23 18:08:56 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/pci/agp.c,v 1.34 2003/11/11 21:49:18 anholt Exp $");
 
 #include "opt_bus.h"
 
@@ -175,6 +175,11 @@
 			      "allocating GATT for aperture of size %dM\n",
 			      apsize / (1024*1024));
 
+	if (entries == 0) {
+		device_printf(dev, "bad aperture size\n");
+		return NULL;
+	}
+
 	gatt = malloc(sizeof(struct agp_gatt), M_AGP, M_NOWAIT);
 	if (!gatt)
 		return 0;

==== //depot/projects/smpng/sys/pci/agp_ali.c#7 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pci/agp_ali.c,v 1.8 2003/08/22 07:13:20 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/pci/agp_ali.c,v 1.9 2003/11/11 21:49:18 anholt Exp $");
 
 #include "opt_bus.h"
 
@@ -102,6 +102,10 @@
 		return error;
 
 	sc->initial_aperture = AGP_GET_APERTURE(dev);
+	if (sc->initial_aperture == 0) {
+		device_printf(dev, "bad initial aperture size, disabling\n");
+		return ENXIO;
+	}
 
 	for (;;) {
 		gatt = agp_alloc_gatt(dev);