From da4f3c5cb1f356f2d4e9e8ae5d16db6c62f7536d Mon Sep 17 00:00:00 2001
From: guenther <>
Date: Sat, 7 Jan 2012 05:38:12 +0000
Subject: [PATCH] Add rtable id and thread id to struct kinfo_proc (and fix
 process id) and add an 'rtableid' keyword to ps.

Add rtable id, thread id, and socket splice info to struct kinfo_file2
and make fstat display socket splice information.

Remove old KVM_PROC2 and kinfo_proc2 interfaces; bump libkvm major

Socket splice info and corrections from bluhm@  "Lovely" deraadt@
---
 src/include/kvm.h | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/include/kvm.h b/src/include/kvm.h
index b490863f..a1836452 100644
--- a/src/include/kvm.h
+++ b/src/include/kvm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm.h,v 1.15 2011/03/12 04:54:28 guenther Exp $	*/
+/*	$OpenBSD: kvm.h,v 1.16 2012/01/07 05:38:12 guenther Exp $	*/
 /*	$NetBSD: kvm.h,v 1.7 1996/04/19 12:02:50 leo Exp $	*/
 
 /*-
@@ -76,17 +76,6 @@ ssize_t	  kvm_read(kvm_t *, unsigned long, void *, size_t)
 ssize_t	  kvm_write(kvm_t *, unsigned long, const void *, size_t)
 		__attribute__((__bounded__(__buffer__,3,4)));
 
-/*
- * Old names that will disappear in a few revisions
- */
-#ifndef kinfo_proc2
-#define kinfo_proc2	kinfo_proc
-#endif
-char	**kvm_getargv2(kvm_t *, const struct kinfo_proc *, int);
-char	**kvm_getenvv2(kvm_t *, const struct kinfo_proc *, int);
-struct kinfo_proc *
-	  kvm_getproc2(kvm_t *, int, int, size_t, int *);
-
 __END_DECLS
 
 #endif /* !_KVM_H_ */