diff options
author | uqs <uqs@FreeBSD.org> | 2011-01-23 11:08:28 +0000 |
---|---|---|
committer | uqs <uqs@FreeBSD.org> | 2011-01-23 11:08:28 +0000 |
commit | 7fdf187c116172ba5c8238926c41445a02f3a4ad (patch) | |
tree | affb155452e52759603cd28ea92e941e8e5ab8a0 /lib/libkvm/kvm_minidump_mips.c | |
parent | 72b8fc74b4eb02687ea1cfa8837baa1fe5f697ec (diff) | |
download | FreeBSD-src-7fdf187c116172ba5c8238926c41445a02f3a4ad.zip FreeBSD-src-7fdf187c116172ba5c8238926c41445a02f3a4ad.tar.gz |
libkvm code janitoring
- make WARNS=6 clean for archs w/o strict alignment requirments
- add const, ANSIfy, remove unused vars, cast types for comparison
- thanks to differing definitions of VM_MIN_ADDRESS across our archs, we
need to trick the compiler to not complain about signedness. We could
either fix VM_MIN_ADDRESS to always be a simple integer or make the
check conditional on $ARCH.
Closes PRs: kern/42386, kern/83364
Reviewed by: bde
Diffstat (limited to 'lib/libkvm/kvm_minidump_mips.c')
-rw-r--r-- | lib/libkvm/kvm_minidump_mips.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/libkvm/kvm_minidump_mips.c b/lib/libkvm/kvm_minidump_mips.c index c82e249..7161115 100644 --- a/lib/libkvm/kvm_minidump_mips.c +++ b/lib/libkvm/kvm_minidump_mips.c @@ -140,7 +140,6 @@ _kvm_minidump_freevtop(kvm_t *kd) int _kvm_minidump_initvtop(kvm_t *kd) { - u_long pa; struct vmstate *vmst; off_t off; @@ -182,7 +181,7 @@ _kvm_minidump_initvtop(kvm_t *kd) } if (pread(kd->pmfd, vmst->bitmap, vmst->hdr.bitmapsize, off) != - vmst->hdr.bitmapsize) { + (ssize_t)vmst->hdr.bitmapsize) { _kvm_err(kd, kd->program, "cannot read %d bytes for page bitmap", vmst->hdr.bitmapsize); return (-1); @@ -197,7 +196,7 @@ _kvm_minidump_initvtop(kvm_t *kd) } if (pread(kd->pmfd, vmst->ptemap, vmst->hdr.ptesize, off) != - vmst->hdr.ptesize) { + (ssize_t)vmst->hdr.ptesize) { _kvm_err(kd, kd->program, "cannot read %d bytes for ptemap", vmst->hdr.ptesize); return (-1); @@ -219,7 +218,6 @@ _kvm_minidump_kvatop(kvm_t *kd, u_long va, off_t *pa) u_long offset, pteindex, a; off_t ofs; pt_entry_t *ptemap; - int i; if (ISALIVE(kd)) { _kvm_err(kd, 0, "kvm_kvatop called in live kernel!"); @@ -238,9 +236,9 @@ _kvm_minidump_kvatop(kvm_t *kd, u_long va, off_t *pa) a = (MIPS_XKPHYS_TO_PHYS(va)); else #endif - if (va >= MIPS_KSEG0_START && va < MIPS_KSEG0_END) + if (va >= (u_long)MIPS_KSEG0_START && va < (u_long)MIPS_KSEG0_END) a = (MIPS_KSEG0_TO_PHYS(va)); - else if (va >= MIPS_KSEG1_START && va < MIPS_KSEG1_END) + else if (va >= (u_long)MIPS_KSEG1_START && va < (u_long)MIPS_KSEG1_END) a = (MIPS_KSEG1_TO_PHYS(va)); else if (va >= vm->hdr.kernbase) { pteindex = (va - vm->hdr.kernbase) >> PAGE_SHIFT; |