Module Name: src
Committed By: martin
Date: Wed Oct 7 11:56:41 UTC 2015
Modified Files:
src/lib/libkvm: kvm_sparc.c
Log Message:
Fix the -m32 compat build for sparc64 after recent sparc/include/types.h
changes. XXX I suspect this variant has not been tested in real life.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/lib/libkvm/kvm_sparc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libkvm/kvm_sparc.c
diff -u src/lib/libkvm/kvm_sparc.c:1.33 src/lib/libkvm/kvm_sparc.c:1.34
--- src/lib/libkvm/kvm_sparc.c:1.33 Wed Feb 19 20:21:22 2014
+++ src/lib/libkvm/kvm_sparc.c Wed Oct 7 11:56:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_sparc.c,v 1.33 2014/02/19 20:21:22 dsl Exp $ */
+/* $NetBSD: kvm_sparc.c,v 1.34 2015/10/07 11:56:41 martin Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm_sparc.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: kvm_sparc.c,v 1.33 2014/02/19 20:21:22 dsl Exp $");
+__RCSID("$NetBSD: kvm_sparc.c,v 1.34 2015/10/07 11:56:41 martin Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -325,8 +325,8 @@ _kvm_kvatop4u(kvm_t *kd, vaddr_t va, pad
* segmap[cpup->nsegmap];
*/
segmaps = (int64_t **)((long)kd->cpu_data + cpup->segmapoffset);
- ptes = (int64_t *)(int)_kvm_pa2off(kd,
- (paddr_t)segmaps[sparc64_va_to_seg(va)]);
+ ptes = (int64_t *)(intptr_t)_kvm_pa2off(kd,
+ (paddr_t)(intptr_t)segmaps[sparc64_va_to_seg(va)]);
pte = ptes[sparc64_va_to_pte(va)];
if ((pte & SPARC64_TLB_V) != 0)
return ((pte & SPARC64_TLB_PA_MASK) | (va & (kd->nbpg - 1)));
@@ -363,7 +363,7 @@ _kvm_pa2off(kvm_t *kd, paddr_t pa)
off += mp->size;
}
if (nmem < 0) {
- _kvm_err(kd, 0, "invalid address (%lx)", pa);
+ _kvm_err(kd, 0, "invalid address (%lx)", (unsigned long)pa);
return (-1);
}
