From owner-svn-src-user@FreeBSD.ORG  Fri Apr 23 07:32:42 2010
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 EE8801065672;
	Fri, 23 Apr 2010 07:32:42 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DDB9D8FC0C;
	Fri, 23 Apr 2010 07:32:42 +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 o3N7Wg5b031431;
	Fri, 23 Apr 2010 07:32:42 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3N7WgON031429;
	Fri, 23 Apr 2010 07:32:42 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004230732.o3N7WgON031429@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Fri, 23 Apr 2010 07:32:42 +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: r207098 - user/jmallett/octeon/sys/mips/cavium
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: Fri, 23 Apr 2010 07:32:43 -0000

Author: jmallett
Date: Fri Apr 23 07:32:42 2010
New Revision: 207098
URL: http://svn.freebsd.org/changeset/base/207098

Log:
  Store realmem and physmem in pages.

Modified:
  user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c

Modified: user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c	Fri Apr 23 06:01:26 2010	(r207097)
+++ user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c	Fri Apr 23 07:32:42 2010	(r207098)
@@ -233,7 +233,7 @@ octeon_memory_init(void)
 		phys_avail[0] = phys_end;
 		phys_avail[1] = 96 << 20;
 
-		physmem = phys_avail[1] - phys_avail[0];
+		realmem = physmem = btoc(phys_avail[1] - phys_avail[0]);
 		return;
 	}
 
@@ -248,7 +248,7 @@ octeon_memory_init(void)
 		if (addr == -1)
 			break;
 
-		physmem += 1 << 20;
+		physmem += btoc(1 << 20);
 
 		if (i > 0 && phys_avail[i - 1] == addr) {
 			phys_avail[i - 1] += 1 << 20;
@@ -260,6 +260,8 @@ octeon_memory_init(void)
 
 		i += 2;
 	}
+
+	realmem = physmem;
 }
 
 void