From owner-p4-projects@FreeBSD.ORG  Thu Sep 23 01:45:48 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B585C16A4D0; Thu, 23 Sep 2004 01:45:47 +0000 (GMT)
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 7FDDA16A4CE
	for <perforce@freebsd.org>; Thu, 23 Sep 2004 01:45:47 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7312C43D3F
	for <perforce@freebsd.org>; Thu, 23 Sep 2004 01:45:47 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8N1jlc3095804
	for <perforce@freebsd.org>; Thu, 23 Sep 2004 01:45:47 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8N1jlSu095801
	for perforce@freebsd.org; Thu, 23 Sep 2004 01:45:47 GMT
	(envelope-from marcel@freebsd.org)
Date: Thu, 23 Sep 2004 01:45:47 GMT
Message-Id: <200409230145.i8N1jlSu095801@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>
Subject: PERFORCE change 61983 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Thu, 23 Sep 2004 01:45:48 -0000

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

Change 61983 by marcel@marcel_nfs on 2004/09/23 01:45:46

	IFC @61981

Affected files ...

.. //depot/projects/ia64/lib/libkvm/kvm_ia64.c#5 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libkvm/kvm_ia64.c,v 1.5 2004/09/22 20:26:33 marcel Exp $ */
+/* $FreeBSD: src/lib/libkvm/kvm_ia64.c,v 1.6 2004/09/23 00:05:20 marcel Exp $ */
 /*	$NetBSD: kvm_alpha.c,v 1.7.2.1 1997/11/02 20:34:26 mellon Exp $	*/
 
 /*
@@ -196,9 +196,9 @@
 		pgaddr += (pgno * sizeof(pte));
 		if (kvm_read(kd, pgaddr, &pte, sizeof(pte)) != sizeof(pte))
 			goto fail;
-		if (!pte.pte_p)
+		if (!(pte.pte & PTE_PRESENT))
 			goto fail;
-		va = ((u_long)pte.pte_ppn << 12) + (va & (pgsz - 1));
+		va = (pte.pte & PTE_PPN_MASK) + (va & (pgsz - 1));
 		return (_kvm_pa2off(kd, va, pa, pgsz));
 	}