From owner-p4-projects@FreeBSD.ORG  Fri Apr 18 01:13:07 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CB4811065674; Fri, 18 Apr 2008 01:13:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 738E11065672
	for <perforce@freebsd.org>; Fri, 18 Apr 2008 01:13:07 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5AD928FC0A
	for <perforce@freebsd.org>; Fri, 18 Apr 2008 01:13:07 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3I1D7v6029035
	for <perforce@freebsd.org>; Fri, 18 Apr 2008 01:13:07 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3I1D7x9029033
	for perforce@freebsd.org; Fri, 18 Apr 2008 01:13:07 GMT
	(envelope-from marcel@freebsd.org)
Date: Fri, 18 Apr 2008 01:13:07 GMT
Message-Id: <200804180113.m3I1D7x9029033@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 140193 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 18 Apr 2008 01:13:08 -0000

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

Change 140193 by marcel@marcel_cluster on 2008/04/18 01:12:33

	Add a size argument to ldr_alloc(), so that the API is
	more common and less implicit.

Affected files ...

.. //depot/projects/ia64/sys/boot/ia64/common/copy.c#6 edit
.. //depot/projects/ia64/sys/boot/ia64/common/libia64.h#6 edit
.. //depot/projects/ia64/sys/boot/ia64/efi/efimd.c#8 edit
.. //depot/projects/ia64/sys/boot/ia64/ski/skimd.c#4 edit

Differences ...

==== //depot/projects/ia64/sys/boot/ia64/common/copy.c#6 (text+ko) ====

@@ -73,7 +73,7 @@
 	ofs = va & IA64_LVM_PAGE_MASK;
 	pa = ia64_pgtbl[idx];
 	if (pa == 0) {
-		pa = ldr_alloc(va - ofs);
+		pa = ldr_alloc(va - ofs, IA64_LVM_PAGE_SIZE);
 		if (pa == 0) {
 			*len = 0;
 			return (NULL);

==== //depot/projects/ia64/sys/boot/ia64/common/libia64.h#6 (text+ko) ====

@@ -36,7 +36,7 @@
  * Portability functions provided by the loader
  * implementation specific to the platform.
  */
-extern uint64_t ldr_alloc(vm_offset_t);
+extern uint64_t ldr_alloc(vm_offset_t, vm_size_t);
 extern int ldr_bootinfo(struct bootinfo *, uint64_t *);
 extern int ldr_enter(const char *);
 

==== //depot/projects/ia64/sys/boot/ia64/efi/efimd.c#8 (text+ko) ====

@@ -48,7 +48,7 @@
 static UINTN mapkey;
 
 uint64_t
-ldr_alloc(vm_offset_t va)
+ldr_alloc(vm_offset_t va, vm_size_t sz)
 {
 
 	return (0);

==== //depot/projects/ia64/sys/boot/ia64/ski/skimd.c#4 (text+ko) ====

@@ -41,7 +41,7 @@
 extern void sal_stub_init(void);
 
 uint64_t
-ldr_alloc(vm_offset_t va)
+ldr_alloc(vm_offset_t va, vm_size_t sz __unused)
 {
 
 	if (va >= PHYS_SIZE)