From c23ad1796fa838ef231a24a3969f3f234da8b0e5 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Wed, 6 Oct 2021 00:42:46 +0000
Subject: [PATCH] annotate sys/param.h uses as required, and pull in standard
 userland .h files as required.... preparing for a potential future when
 sys/proc.h might be more clean... do not touch the MD .c files yet, the
 dragons remain full of fire

---
 lib/libkvm/kvm.c         | 4 ++--
 lib/libkvm/kvm_proc2.c   | 4 ++--
 lib/libkvm/kvm_sparc64.c | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index 928d8f94584..a0d9c61e925 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm.c,v 1.68 2021/03/11 07:43:34 deraadt Exp $ */
+/*	$OpenBSD: kvm.c,v 1.69 2021/10/06 00:42:46 deraadt Exp $ */
 /*	$NetBSD: kvm.c,v 1.43 1996/05/05 04:31:59 gwr Exp $	*/
 
 /*-
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN MID_MACHINE */
+#include <sys/param.h>	/* MAXCOMLEN MID_MACHINE ALIGN */
 #include <sys/proc.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
diff --git a/lib/libkvm/kvm_proc2.c b/lib/libkvm/kvm_proc2.c
index 89b62e506be..d540f8ea242 100644
--- a/lib/libkvm/kvm_proc2.c
+++ b/lib/libkvm/kvm_proc2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_proc2.c,v 1.34 2021/09/10 00:02:43 deraadt Exp $	*/
+/*	$OpenBSD: kvm_proc2.c,v 1.35 2021/10/06 00:42:46 deraadt Exp $	*/
 /*	$NetBSD: kvm_proc.c,v 1.30 1999/03/24 05:50:50 mrg Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #define __need_process
-#include <sys/param.h>	/* MAXCOMLEN NODEV MIN */
+#include <sys/param.h>	/* MAXCOMLEN NODEV */
 #include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/proc.h>
diff --git a/lib/libkvm/kvm_sparc64.c b/lib/libkvm/kvm_sparc64.c
index 534967490af..3cf5c7e2145 100644
--- a/lib/libkvm/kvm_sparc64.c
+++ b/lib/libkvm/kvm_sparc64.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_sparc64.c,v 1.10 2013/11/01 15:57:56 deraadt Exp $	*/
+/*	$OpenBSD: kvm_sparc64.c,v 1.11 2021/10/06 00:42:47 deraadt Exp $	*/
 /*	$NetBSD: kvm_sparc64.c,v 1.7 2001/08/05 03:33:15 matt Exp $	*/
 
 /*-
@@ -39,7 +39,9 @@
  * vm code will one day obsolete this module.
  */
 
-#include <sys/param.h>
+#include <sys/param.h>	/* MAXCOMLEN PAGE_SIZE */
+#include <sys/types.h>
+#include <sys/signal.h>
 #include <sys/exec.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
-- 
2.20.1