From owner-svn-src-projects@FreeBSD.ORG  Sat May 15 17:02:34 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E49ED1065678;
	Sat, 15 May 2010 17:02:33 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D3CB58FC0A;
	Sat, 15 May 2010 17:02:33 +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 o4FH2XqA036887;
	Sat, 15 May 2010 17:02:33 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4FH2X7W036886;
	Sat, 15 May 2010 17:02:33 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201005151702.o4FH2X7W036886@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 15 May 2010 17:02:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208115 - projects/ppc64/sys/powerpc/aim
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 May 2010 17:02:35 -0000

Author: nwhitehorn
Date: Sat May 15 17:02:33 2010
New Revision: 208115
URL: http://svn.freebsd.org/changeset/base/208115

Log:
  Fix memory map detection in the > 4 GB case by not rounding down to an int.
  This (a) truncated the amount of available RAM, and (b) produced a screwy
  memory map that broke all kinds of things. USB and Firewire work now on my
  desktop.

Modified:
  projects/ppc64/sys/powerpc/aim/ofw_machdep.c

Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/ofw_machdep.c	Sat May 15 15:03:18 2010	(r208114)
+++ projects/ppc64/sys/powerpc/aim/ofw_machdep.c	Sat May 15 17:02:33 2010	(r208115)
@@ -128,9 +128,9 @@ memr_overlap(struct mem_region *r1, stru
 static void
 memr_merge(struct mem_region *from, struct mem_region *to)
 {
-	int end;
-	end = imax(to->mr_start + to->mr_size, from->mr_start + from->mr_size);
-	to->mr_start = imin(from->mr_start, to->mr_start);
+	vm_offset_t end;
+	end = ulmax(to->mr_start + to->mr_size, from->mr_start + from->mr_size);
+	to->mr_start = ulmin(from->mr_start, to->mr_start);
 	to->mr_size = end - to->mr_start;
 }
 
@@ -229,7 +229,6 @@ parse_ofw_memory(phandle_t node, const c
 		int hisz;
 
 		hisz = parse_ofw_memory(node, "reg", himem);
-		j = sz/sizeof(output[0]);
 		for (i = 0; i < hisz/sizeof(himem[0]); i++) {
 			if (himem[i].mr_start > BUS_SPACE_MAXADDR_32BIT) {
 				output[j].mr_start = himem[i].mr_start;