PERFORCE change 100410 for review

John Birrell jb at FreeBSD.org
Sat Jul 1 22:27:29 UTC 2006


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

Change 100410 by jb at 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)


More information about the p4-projects mailing list