Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libkvm Fix the -m32 compat build for sparc64 after recen...



details:   https://anonhg.NetBSD.org/src/rev/46c04d89c257
branches:  trunk
changeset: 811013:46c04d89c257
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Oct 07 11:56:41 2015 +0000

description:
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.

diffstat:

 lib/libkvm/kvm_sparc.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 48144b6e111d -r 46c04d89c257 lib/libkvm/kvm_sparc.c
--- a/lib/libkvm/kvm_sparc.c    Wed Oct 07 09:44:26 2015 +0000
+++ b/lib/libkvm/kvm_sparc.c    Wed Oct 07 11:56:41 2015 +0000
@@ -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 @@
         *      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 @@
                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);
        }
 



Home | Main Index | Thread Index | Old Index