From d415763e8eca6b33134cd1c48e0bb3880267a548 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Wed, 1 Dec 2021 21:45:19 +0000
Subject: [PATCH] sys/core.h is not needed by these files, therefore
 sys/param.h isn't needed for MAXCOMLEN either

---
 lib/libkvm/kvm_arm.c       | 4 +---
 lib/libkvm/kvm_arm64.c     | 6 ++----
 lib/libkvm/kvm_m88k.c      | 3 +--
 lib/libkvm/kvm_powerpc.c   | 4 +---
 lib/libkvm/kvm_powerpc64.c | 4 +---
 lib/libkvm/kvm_riscv64.c   | 4 +---
 lib/libkvm/kvm_sh.c        | 4 +---
 lib/libkvm/kvm_sparc64.c   | 4 +---
 8 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/lib/libkvm/kvm_arm.c b/lib/libkvm/kvm_arm.c
index faa860a856b..45e8325afb4 100644
--- a/lib/libkvm/kvm_arm.c
+++ b/lib/libkvm/kvm_arm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_arm.c,v 1.11 2021/12/01 16:53:28 deraadt Exp $	*/
+/*	$OpenBSD: kvm_arm.c,v 1.12 2021/12/01 21:45:19 deraadt Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -50,9 +50,7 @@
  * ARM machine dependent routines for kvm.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN */
 #include <sys/types.h>
-#include <sys/core.h>
 #include <sys/kcore.h>
 
 #include <unistd.h>
diff --git a/lib/libkvm/kvm_arm64.c b/lib/libkvm/kvm_arm64.c
index dab933bb82f..c37e6e7dc3f 100644
--- a/lib/libkvm/kvm_arm64.c
+++ b/lib/libkvm/kvm_arm64.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_arm64.c,v 1.2 2021/12/01 16:53:28 deraadt Exp $	*/
+/*	$OpenBSD: kvm_arm64.c,v 1.3 2021/12/01 21:45:19 deraadt Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -50,9 +50,7 @@
  * ARM64 machine dependent routines for kvm.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN for sys/core.h */
 #include <sys/types.h>
-#include <sys/core.h>
 #include <sys/kcore.h>
 
 #include <unistd.h>
@@ -64,7 +62,7 @@
 
 #include "kvm_private.h"
 
-#include <arm64/kcore.h>
+#include <machine/kcore.h>
 
 void
 _kvm_freevtop(kvm_t *kd)
diff --git a/lib/libkvm/kvm_m88k.c b/lib/libkvm/kvm_m88k.c
index ea471152213..d37b00d6089 100644
--- a/lib/libkvm/kvm_m88k.c
+++ b/lib/libkvm/kvm_m88k.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_m88k.c,v 1.7 2021/12/01 16:53:28 deraadt Exp $	*/
+/*	$OpenBSD: kvm_m88k.c,v 1.8 2021/12/01 21:45:19 deraadt Exp $	*/
 /*	$NetBSD: kvm_alpha.c,v 1.2 1995/09/29 03:57:48 cgd Exp $	*/
 
 /*
@@ -28,7 +28,6 @@
  * rights to redistribute these changes.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN */
 #include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/proc.h>
diff --git a/lib/libkvm/kvm_powerpc.c b/lib/libkvm/kvm_powerpc.c
index 8693c565ba4..070860209e1 100644
--- a/lib/libkvm/kvm_powerpc.c
+++ b/lib/libkvm/kvm_powerpc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_powerpc.c,v 1.11 2021/12/01 16:53:28 deraadt Exp $	*/
+/*	$OpenBSD: kvm_powerpc.c,v 1.12 2021/12/01 21:45:19 deraadt Exp $	*/
 
 /*-
  * Copyright (C) 1996 Wolfgang Solfrank.
@@ -35,12 +35,10 @@
  * PowerPC machine dependent routines for kvm.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN */
 #include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
-#include <sys/core.h>
 #include <sys/kcore.h>
 #include <unistd.h>
 #include <nlist.h>
diff --git a/lib/libkvm/kvm_powerpc64.c b/lib/libkvm/kvm_powerpc64.c
index 80239b8f0b1..ebe9e1e7b5a 100644
--- a/lib/libkvm/kvm_powerpc64.c
+++ b/lib/libkvm/kvm_powerpc64.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_powerpc64.c,v 1.2 2021/12/01 16:53:28 deraadt Exp $	*/
+/*	$OpenBSD: kvm_powerpc64.c,v 1.3 2021/12/01 21:45:19 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 Miodrag Vallat.
@@ -17,9 +17,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN */
 #include <sys/types.h>
-#include <sys/core.h>
 #include <sys/kcore.h>
 
 #include <unistd.h>
diff --git a/lib/libkvm/kvm_riscv64.c b/lib/libkvm/kvm_riscv64.c
index 68a5d64422a..87328ba0788 100644
--- a/lib/libkvm/kvm_riscv64.c
+++ b/lib/libkvm/kvm_riscv64.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_riscv64.c,v 1.2 2021/12/01 16:53:28 deraadt Exp $	*/
+/*	$OpenBSD: kvm_riscv64.c,v 1.3 2021/12/01 21:45:19 deraadt Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -50,9 +50,7 @@
  * RISCV machine dependent routines for kvm.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN */
 #include <sys/types.h>
-#include <sys/core.h>
 #include <sys/kcore.h>
 
 #include <unistd.h>
diff --git a/lib/libkvm/kvm_sh.c b/lib/libkvm/kvm_sh.c
index 4017e85b394..d5a6adf4d9c 100644
--- a/lib/libkvm/kvm_sh.c
+++ b/lib/libkvm/kvm_sh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_sh.c,v 1.8 2021/12/01 16:53:28 deraadt Exp $	*/
+/*	$OpenBSD: kvm_sh.c,v 1.9 2021/12/01 21:45:19 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 Miodrag Vallat.
@@ -17,9 +17,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN */
 #include <sys/types.h>
-#include <sys/core.h>
 #include <sys/kcore.h>
 
 #include <unistd.h>
diff --git a/lib/libkvm/kvm_sparc64.c b/lib/libkvm/kvm_sparc64.c
index d73b80f7b4a..388420e2481 100644
--- a/lib/libkvm/kvm_sparc64.c
+++ b/lib/libkvm/kvm_sparc64.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_sparc64.c,v 1.12 2021/12/01 16:53:28 deraadt Exp $	*/
+/*	$OpenBSD: kvm_sparc64.c,v 1.13 2021/12/01 21:45:19 deraadt Exp $	*/
 /*	$NetBSD: kvm_sparc64.c,v 1.7 2001/08/05 03:33:15 matt Exp $	*/
 
 /*-
@@ -39,13 +39,11 @@
  * vm code will one day obsolete this module.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN */
 #include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/exec.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
-#include <sys/core.h>
 #include <sys/kcore.h>
 #include <unistd.h>
 #include <nlist.h>
-- 
2.20.1