From owner-p4-projects@FreeBSD.ORG  Sat Jul  1 22:27:29 2006
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 204E716A537; Sat,  1 Jul 2006 22:27:29 +0000 (UTC)
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 D7B2E16A4DE
	for <perforce@freebsd.org>; Sat,  1 Jul 2006 22:27:28 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2E7B545274
	for <perforce@freebsd.org>; Sat,  1 Jul 2006 21:31:16 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61LVGYB031618
	for <perforce@freebsd.org>; Sat, 1 Jul 2006 21:31:16 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61LVFdT031615
	for perforce@freebsd.org; Sat, 1 Jul 2006 21:31:15 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 1 Jul 2006 21:31:15 GMT
Message-Id: <200607012131.k61LVFdT031615@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 100410 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: Sat, 01 Jul 2006 22:27:29 -0000

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

Change 100410 by jb@jb_freebsd2 on 2006/07/01 21:30:43

	IFsun4v_stable

Affected files ...

.. //depot/projects/dtrace/src/lib/libkvm/kvm_sparc64.c#2 integrate

Differences ...

==== //depot/projects/dtrace/src/lib/libkvm/kvm_sparc64.c#2 (text+ko) ====

@@ -194,7 +194,9 @@
 _kvm_kvatop(kvm_t *kd, u_long va, off_t *pa)
 {
 	struct vmstate *vm;
+#if TARGET != sun4v
 	struct tte tte;
+#endif
 	off_t tte_off, pa_off;
 	u_long pg_off, vpn;
 	int rest;
@@ -202,6 +204,7 @@
 	pg_off = va & PAGE_MASK;
 	if (va >= VM_MIN_DIRECT_ADDRESS)
 		pa_off = TLB_DIRECT_TO_PHYS(va) & ~PAGE_MASK;
+#if TARGET != sun4v
 	else {
 		vpn = btop(va);
 		tte_off = kd->vmst->vm_tsb_off +
@@ -212,6 +215,7 @@
 			goto invalid;
 		pa_off = TTE_GET_PA(&tte);
 	}
+#endif
 	rest = PAGE_SIZE - pg_off;
 	pa_off = _kvm_find_off(kd->vmst, pa_off, rest);
 	if (pa_off == KVM_OFF_NOTFOUND)