From owner-svn-src-all@FreeBSD.ORG  Fri Aug  6 15:24:37 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 96218106577E;
	Fri,  6 Aug 2010 15:24:37 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 852928FC21;
	Fri,  6 Aug 2010 15:24:37 +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 o76FOb1E054004;
	Fri, 6 Aug 2010 15:24:37 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o76FObED054002;
	Fri, 6 Aug 2010 15:24:37 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201008061524.o76FObED054002@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 6 Aug 2010 15:24:37 +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: r210938 - head/sys/compat/x86bios
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: Fri, 06 Aug 2010 15:24:37 -0000

Author: jkim
Date: Fri Aug  6 15:24:37 2010
New Revision: 210938
URL: http://svn.freebsd.org/changeset/base/210938

Log:
  Consistently use architecture specific macros.

Modified:
  head/sys/compat/x86bios/x86bios.c

Modified: head/sys/compat/x86bios/x86bios.c
==============================================================================
--- head/sys/compat/x86bios/x86bios.c	Fri Aug  6 15:15:26 2010	(r210937)
+++ head/sys/compat/x86bios/x86bios.c	Fri Aug  6 15:24:37 2010	(r210938)
@@ -120,9 +120,9 @@ x86bios_alloc(uint32_t *offset, size_t s
 	if (addr != 0) {
 		*offset = vtophys(addr);
 		mtx_lock(&x86bios_lock);
-		for (i = 0; i < howmany(size, PAGE_SIZE); i++)
+		for (i = 0; i < atop(round_page(size)); i++)
 			vm86_addpage(&x86bios_vmc, atop(*offset) + i,
-			    addr + i * PAGE_SIZE);
+			    addr + ptoa(i));
 		mtx_unlock(&x86bios_lock);
 	}
 
@@ -147,7 +147,7 @@ x86bios_free(void *addr, size_t size)
 		return;
 	}
 	if (last == x86bios_vmc.npages - 1) {
-		x86bios_vmc.npages -= howmany(size, PAGE_SIZE);
+		x86bios_vmc.npages -= atop(round_page(size));
 		for (i = x86bios_vmc.npages - 1;
 		    i >= 0 && x86bios_vmc.pmap[i].kva == 0; i--)
 			x86bios_vmc.npages--;