diff options
author | attilio <attilio@FreeBSD.org> | 2011-05-14 02:28:26 +0000 |
---|---|---|
committer | attilio <attilio@FreeBSD.org> | 2011-05-14 02:28:26 +0000 |
commit | 548a471624011260b4f4033bddb96cfa5bd895bd (patch) | |
tree | 6576f236efccf1a1862dda80ebd5f1802219a58b /lib/libkvm | |
parent | 9ff3491e673bf8c43598fcc1af408f5e7c80e854 (diff) | |
download | FreeBSD-src-548a471624011260b4f4033bddb96cfa5bd895bd.zip FreeBSD-src-548a471624011260b4f4033bddb96cfa5bd895bd.tar.gz |
MFC
Diffstat (limited to 'lib/libkvm')
-rw-r--r-- | lib/libkvm/Makefile | 4 | ||||
-rw-r--r-- | lib/libkvm/kvm_sparc64.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile index cda9771..1250bf7 100644 --- a/lib/libkvm/Makefile +++ b/lib/libkvm/Makefile @@ -5,10 +5,6 @@ LIB= kvm SHLIBDIR?= /lib CFLAGS+=-DLIBC_SCCS -I${.CURDIR} -.if ${MACHINE} == "sun4v" -CFLAGS+=-DSUN4V -.endif - .if exists(${.CURDIR}/kvm_${MACHINE_ARCH}.c) KVM_ARCH=${MACHINE_ARCH} .else diff --git a/lib/libkvm/kvm_sparc64.c b/lib/libkvm/kvm_sparc64.c index a534d1d..1f925a9 100644 --- a/lib/libkvm/kvm_sparc64.c +++ b/lib/libkvm/kvm_sparc64.c @@ -188,11 +188,9 @@ fail_vm: int _kvm_kvatop(kvm_t *kd, u_long va, off_t *pa) { -#if !defined(SUN4V) struct tte tte; off_t tte_off; u_long vpn; -#endif off_t pa_off; u_long pg_off; int rest; @@ -200,7 +198,6 @@ _kvm_kvatop(kvm_t *kd, u_long va, off_t *pa) pg_off = va & PAGE_MASK; if (va >= VM_MIN_DIRECT_ADDRESS) pa_off = TLB_DIRECT_TO_PHYS(va) & ~PAGE_MASK; -#if !defined(SUN4V) else { vpn = btop(va); tte_off = kd->vmst->vm_tsb_off + @@ -211,7 +208,6 @@ _kvm_kvatop(kvm_t *kd, u_long va, off_t *pa) 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) |