summaryrefslogtreecommitdiffstats
path: root/lib/libkvm/kvm.h
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2014-03-04 14:49:05 +0000
committerglebius <glebius@FreeBSD.org>2014-03-04 14:49:05 +0000
commit1b9278cc989bd23a4e620f1b58d624819ca8e1c0 (patch)
treee6cab10d804696e76d834c1b19644b92664d2d09 /lib/libkvm/kvm.h
parent8a9528c4d0ec97d5f0c55b27a51613851b619e04 (diff)
downloadFreeBSD-src-1b9278cc989bd23a4e620f1b58d624819ca8e1c0.zip
FreeBSD-src-1b9278cc989bd23a4e620f1b58d624819ca8e1c0.tar.gz
Merge r261796 from head:
While it isn't too late and kvm_read_zpcpu() function isn't yet used outside libkvm(3), change its order of arguments, so that it is the same as in kvm_read(). Merge r261805 from head: Add kvm_getncpus() to obtain mp_ncpus.
Diffstat (limited to 'lib/libkvm/kvm.h')
-rw-r--r--lib/libkvm/kvm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libkvm/kvm.h b/lib/libkvm/kvm.h
index d2ee8fa..d697795 100644
--- a/lib/libkvm/kvm.h
+++ b/lib/libkvm/kvm.h
@@ -77,6 +77,7 @@ char *kvm_geterr(kvm_t *);
char *kvm_getfiles(kvm_t *, int, int, int *);
int kvm_getloadavg(kvm_t *, double [], int);
int kvm_getmaxcpu(kvm_t *);
+int kvm_getncpus(kvm_t *);
void *kvm_getpcpu(kvm_t *, int);
uint64_t kvm_counter_u64_fetch(kvm_t *, u_long);
struct kinfo_proc *
@@ -88,7 +89,7 @@ kvm_t *kvm_open
kvm_t *kvm_openfiles
(const char *, const char *, const char *, int, char *);
ssize_t kvm_read(kvm_t *, unsigned long, void *, size_t);
-ssize_t kvm_read_zpcpu(kvm_t *, void *, u_long, size_t, int);
+ssize_t kvm_read_zpcpu(kvm_t *, unsigned long, void *, size_t, int);
ssize_t kvm_write(kvm_t *, unsigned long, const void *, size_t);
__END_DECLS
OpenPOWER on IntegriCloud