From owner-svn-src-all@FreeBSD.ORG  Mon Jul  9 16:24:00 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0C40C106564A;
	Mon,  9 Jul 2012 16:24:00 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EB8458FC08;
	Mon,  9 Jul 2012 16:23:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q69GNxh5028129;
	Mon, 9 Jul 2012 16:23:59 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q69GNxhf028127;
	Mon, 9 Jul 2012 16:23:59 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201207091623.q69GNxhf028127@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Mon, 9 Jul 2012 16:23:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238301 - head/sys/dev/agp
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jul 2012 16:24:00 -0000

Author: marcel
Date: Mon Jul  9 16:23:59 2012
New Revision: 238301
URL: http://svn.freebsd.org/changeset/base/238301

Log:
  Revert revision 238172 of agp_i810.c.  Correctness is considered more
  important than avoiding confusion.
  
  Feedback from: kib, jhb

Modified:
  head/sys/dev/agp/agp_i810.c

Modified: head/sys/dev/agp/agp_i810.c
==============================================================================
--- head/sys/dev/agp/agp_i810.c	Mon Jul  9 15:44:35 2012	(r238300)
+++ head/sys/dev/agp/agp_i810.c	Mon Jul  9 16:23:59 2012	(r238301)
@@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
+#include <machine/md_var.h>
 #include <sys/rman.h>
 
 MALLOC_DECLARE(M_AGP);
@@ -1438,7 +1439,7 @@ agp_i810_attach(device_t dev)
 	if (error)
 		return (error);
 
-	if (ptoa((vm_paddr_t)realmem) >
+	if (ptoa((vm_paddr_t)Maxmem) >
 	    (1ULL << sc->match->driver->busdma_addr_mask_sz) - 1) {
 		device_printf(dev, "agp_i810 does not support physical "
 		    "memory above %ju.\n", (uintmax_t)(1ULL <<