From owner-p4-projects@FreeBSD.ORG  Tue Jun 28 19:14:29 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 89F2616A45C; Tue, 28 Jun 2005 19:14:28 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 25D2716A43D
	for <perforce@freebsd.org>; Tue, 28 Jun 2005 19:14:28 +0000 (GMT)
	(envelope-from ps@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EA5E643D49
	for <perforce@freebsd.org>; Tue, 28 Jun 2005 19:14:27 +0000 (GMT)
	(envelope-from ps@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5SJERjS096939
	for <perforce@freebsd.org>; Tue, 28 Jun 2005 19:14:27 GMT
	(envelope-from ps@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5SJERBg096935
	for perforce@freebsd.org; Tue, 28 Jun 2005 19:14:27 GMT
	(envelope-from ps@freebsd.org)
Date: Tue, 28 Jun 2005 19:14:27 GMT
Message-Id: <200506281914.j5SJERBg096935@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ps@freebsd.org using -f
From: Paul Saab <ps@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79094 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: Tue, 28 Jun 2005 19:14:29 -0000

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

Change 79094 by ps@butter.corp on 2005/06/28 19:14:25

	Update to match prototype change.  Some systems u_long is
	uint64_t, but change them all to be the same.

Affected files ...

.. //depot/projects/hammer/lib/libkvm/kvm_amd64.c#13 edit
.. //depot/projects/hammer/lib/libkvm/kvm_arm.c#2 edit
.. //depot/projects/hammer/lib/libkvm/kvm_ia64.c#5 edit
.. //depot/projects/hammer/lib/libkvm/kvm_powerpc.c#2 edit
.. //depot/projects/hammer/lib/libkvm/kvm_sparc.c#2 edit
.. //depot/projects/hammer/lib/libkvm/kvm_sparc64.c#5 edit

Differences ...

==== //depot/projects/hammer/lib/libkvm/kvm_amd64.c#13 (text+ko) ====

@@ -194,7 +194,7 @@
 }
 
 int
-_kvm_kvatop(kvm_t *kd, u_long va, u_long *pa)
+_kvm_kvatop(kvm_t *kd, u_long va, uint64_t *pa)
 {
 	struct vmstate *vm;
 	u_long offset;

==== //depot/projects/hammer/lib/libkvm/kvm_arm.c#2 (text+ko) ====

@@ -68,7 +68,7 @@
 _kvm_kvatop(kd, va, pa)
 	kvm_t *kd;
 	u_long va;
-	u_long *pa;
+	uint64_t *pa;
 {
 	_kvm_err(kd, 0, "vatop not yet implemented!");
 	return 0;

==== //depot/projects/hammer/lib/libkvm/kvm_ia64.c#5 (text+ko) ====

@@ -85,7 +85,7 @@
  * Translate a physical memory address to a file-offset in the crash-dump.
  */
 static size_t
-_kvm_pa2off(kvm_t *kd, uint64_t pa, u_long *ofs, size_t pgsz)
+_kvm_pa2off(kvm_t *kd, uint64_t pa, uint64_t *ofs, size_t pgsz)
 {
 	Elf64_Ehdr *e = kd->vmst->mmapbase;
 	Elf64_Phdr *p = (Elf64_Phdr*)((char*)e + e->e_phoff);
@@ -171,7 +171,7 @@
 }
 
 int
-_kvm_kvatop(kvm_t *kd, u_long va, u_long *pa)
+_kvm_kvatop(kvm_t *kd, u_long va, uint64_t *pa)
 {
 	struct ia64_lpte pte;
 	uint64_t pgaddr, ptaddr;

==== //depot/projects/hammer/lib/libkvm/kvm_powerpc.c#2 (text+ko) ====

@@ -77,7 +77,7 @@
 off_t
 _kvm_pa2off(kd, pa)
 	kvm_t *kd;
-	u_long pa;
+	uint64_t pa;
 {
 	_kvm_err(kd, 0, "pa2off not yet implemented!");
 	return 0;

==== //depot/projects/hammer/lib/libkvm/kvm_sparc.c#2 (text+ko) ====

@@ -216,7 +216,7 @@
 _kvm_kvatop(kd, va, pa)
 	kvm_t *kd;
 	u_long va;
-	u_long *pa;
+	uint64_t *pa;
 {
 	struct vmstate *vm;
 	int s;

==== //depot/projects/hammer/lib/libkvm/kvm_sparc64.c#5 (text+ko) ====

@@ -191,7 +191,7 @@
 }
 
 int
-_kvm_kvatop(kvm_t *kd, u_long va, u_long *pa)
+_kvm_kvatop(kvm_t *kd, u_long va, uint64_t *pa)
 {
 	struct vmstate *vm;
 	struct tte tte;