From 1e64a2f2af333952a8200cc0da3601eae02805a4 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Fri, 14 May 2021 06:48:52 +0000
Subject: [PATCH] remove uneeded includes

---
 sys/arch/riscv64/dev/mainbus.c             | 3 +--
 sys/arch/riscv64/dev/riscv_cpu_intc.c      | 7 +------
 sys/arch/riscv64/dev/simplebus.c           | 3 +--
 sys/arch/riscv64/riscv64/ast.c             | 4 +---
 sys/arch/riscv64/riscv64/autoconf.c        | 5 +----
 sys/arch/riscv64/riscv64/bus_dma.c         | 3 +--
 sys/arch/riscv64/riscv64/conf.c            | 3 +--
 sys/arch/riscv64/riscv64/cpu.c             | 3 +--
 sys/arch/riscv64/riscv64/intr.c            | 5 +----
 sys/arch/riscv64/riscv64/machdep.c         | 5 +----
 sys/arch/riscv64/riscv64/mem.c             | 5 +----
 sys/arch/riscv64/riscv64/pmap.c            | 9 +--------
 sys/arch/riscv64/riscv64/process_machdep.c | 3 +--
 sys/arch/riscv64/riscv64/sig_machdep.c     | 3 +--
 sys/arch/riscv64/riscv64/syscall.c         | 5 +----
 sys/arch/riscv64/riscv64/trap.c            | 4 +---
 sys/arch/riscv64/riscv64/vm_machdep.c      | 8 +-------
 17 files changed, 17 insertions(+), 61 deletions(-)

diff --git a/sys/arch/riscv64/dev/mainbus.c b/sys/arch/riscv64/dev/mainbus.c
index 5eaf7269046..75b72e99384 100644
--- a/sys/arch/riscv64/dev/mainbus.c
+++ b/sys/arch/riscv64/dev/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.6 2021/05/12 01:20:52 jsg Exp $ */
+/*	$OpenBSD: mainbus.c,v 1.7 2021/05/14 06:48:52 jsg Exp $ */
 
 /*
  * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
@@ -19,7 +19,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 
diff --git a/sys/arch/riscv64/dev/riscv_cpu_intc.c b/sys/arch/riscv64/dev/riscv_cpu_intc.c
index 7f4f78e82fa..f00ae558d14 100644
--- a/sys/arch/riscv64/dev/riscv_cpu_intc.c
+++ b/sys/arch/riscv64/dev/riscv_cpu_intc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: riscv_cpu_intc.c,v 1.7 2021/05/13 19:26:25 kettenis Exp $	*/
+/*	$OpenBSD: riscv_cpu_intc.c,v 1.8 2021/05/14 06:48:52 jsg Exp $	*/
 
 /*
  * Copyright (c) 2020, Mars Li <mengshi.li.mars@gmail.com>
@@ -18,19 +18,14 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/queue.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/evcount.h>
 
-#include <machine/bus.h>
 #include <machine/fdt.h>
 #include <machine/riscvreg.h>
 
 #include <dev/ofw/openfirm.h>
-#include <dev/ofw/fdt.h>
 
-#include "riscv64/dev/plic.h"
 #include "riscv_cpu_intc.h"
 
 struct intrhand {
diff --git a/sys/arch/riscv64/dev/simplebus.c b/sys/arch/riscv64/dev/simplebus.c
index 17e989ed64b..586accd1865 100644
--- a/sys/arch/riscv64/dev/simplebus.c
+++ b/sys/arch/riscv64/dev/simplebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: simplebus.c,v 1.3 2021/05/12 01:20:52 jsg Exp $	*/
+/*	$OpenBSD: simplebus.c,v 1.4 2021/05/14 06:48:52 jsg Exp $	*/
 
 /*
  * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
@@ -18,7 +18,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 
diff --git a/sys/arch/riscv64/riscv64/ast.c b/sys/arch/riscv64/riscv64/ast.c
index a9c162ae1e7..1d9cee46f99 100644
--- a/sys/arch/riscv64/riscv64/ast.c
+++ b/sys/arch/riscv64/riscv64/ast.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ast.c,v 1.2 2021/05/12 01:20:52 jsg Exp $	*/
+/*	$OpenBSD: ast.c,v 1.3 2021/05/14 06:48:52 jsg Exp $	*/
 
 /*
  * Copyright (c) 2015 Dale Rahn <drahn@dalerahn.com>
@@ -19,10 +19,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/signalvar.h>
 #include <sys/proc.h>
 #include <sys/user.h>
-#include <sys/signal.h>
 #include <sys/syscall.h>
 #include <sys/syscall_mi.h>
 #include <machine/pcb.h>
diff --git a/sys/arch/riscv64/riscv64/autoconf.c b/sys/arch/riscv64/riscv64/autoconf.c
index a564e72d3a3..a447667bd51 100644
--- a/sys/arch/riscv64/riscv64/autoconf.c
+++ b/sys/arch/riscv64/riscv64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.3 2021/05/12 01:20:52 jsg Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.4 2021/05/14 06:48:52 jsg Exp $	*/
 
 /*
  * Copyright (c) 2009 Miodrag Vallat.
@@ -18,7 +18,6 @@
 
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/disklabel.h>
 #include <sys/reboot.h>
 #include <sys/hibernate.h>
 #include <sys/systm.h>
@@ -31,8 +30,6 @@
 #include <netinet/if_ether.h>
 #endif
 
-#include <machine/bootconfig.h>
-
 extern void dumpconf(void);
 
 void
diff --git a/sys/arch/riscv64/riscv64/bus_dma.c b/sys/arch/riscv64/riscv64/bus_dma.c
index 9df0732264d..08935d266c6 100644
--- a/sys/arch/riscv64/riscv64/bus_dma.c
+++ b/sys/arch/riscv64/riscv64/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus_dma.c,v 1.4 2021/05/12 01:20:52 jsg Exp $	*/
+/*	$OpenBSD: bus_dma.c,v 1.5 2021/05/14 06:48:52 jsg Exp $	*/
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -56,7 +56,6 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
diff --git a/sys/arch/riscv64/riscv64/conf.c b/sys/arch/riscv64/riscv64/conf.c
index 8b959af0990..5cf740fb799 100644
--- a/sys/arch/riscv64/riscv64/conf.c
+++ b/sys/arch/riscv64/riscv64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.7 2021/05/12 01:20:52 jsg Exp $	*/
+/*	$OpenBSD: conf.c,v 1.8 2021/05/14 06:48:52 jsg Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -35,7 +35,6 @@
 #include <sys/disklabel.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
-#include <sys/vnode.h>
 
 #include <machine/conf.h>
 
diff --git a/sys/arch/riscv64/riscv64/cpu.c b/sys/arch/riscv64/riscv64/cpu.c
index b242daf6e19..0874e9446a3 100644
--- a/sys/arch/riscv64/riscv64/cpu.c
+++ b/sys/arch/riscv64/riscv64/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.6 2021/05/12 01:20:52 jsg Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.7 2021/05/14 06:48:52 jsg Exp $	*/
 
 /*
  * Copyright (c) 2016 Dale Rahn <drahn@dalerahn.com>
@@ -24,7 +24,6 @@
 #include <sys/sysctl.h>
 
 #include <machine/fdt.h>
-#include <machine/riscvreg.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_clock.h>
diff --git a/sys/arch/riscv64/riscv64/intr.c b/sys/arch/riscv64/riscv64/intr.c
index f4babfaf317..471cbb987a5 100644
--- a/sys/arch/riscv64/riscv64/intr.c
+++ b/sys/arch/riscv64/riscv64/intr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.c,v 1.5 2021/05/13 19:26:25 kettenis Exp $	*/
+/*	$OpenBSD: intr.c,v 1.6 2021/05/14 06:48:52 jsg Exp $	*/
 
 /*
  * Copyright (c) 2011 Dale Rahn <drahn@openbsd.org>
@@ -18,13 +18,10 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/timetc.h>
 #include <sys/malloc.h>
 
-#include <dev/clock_subr.h>
 #include <machine/cpu.h>
 #include <machine/intr.h>
-#include <machine/frame.h>
 
 #include <dev/ofw/openfirm.h>
 
diff --git a/sys/arch/riscv64/riscv64/machdep.c b/sys/arch/riscv64/riscv64/machdep.c
index e271e6b4380..a1dd5f9d0a4 100644
--- a/sys/arch/riscv64/riscv64/machdep.c
+++ b/sys/arch/riscv64/riscv64/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.15 2021/05/13 19:26:25 kettenis Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.16 2021/05/14 06:48:52 jsg Exp $	*/
 
 /*
  * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
@@ -28,14 +28,11 @@
 #include <sys/user.h>
 #include <sys/conf.h>
 #include <sys/kcore.h>
-#include <sys/core.h>
 #include <sys/msgbuf.h>
 #include <sys/buf.h>
-#include <sys/termios.h>
 #include <sys/sensors.h>
 #include <sys/malloc.h>
 #include <sys/syscallargs.h>
-#include <sys/stdarg.h>
 
 #include <net/if.h>
 #include <uvm/uvm.h>
diff --git a/sys/arch/riscv64/riscv64/mem.c b/sys/arch/riscv64/riscv64/mem.c
index e2e58d16925..295ead0da63 100644
--- a/sys/arch/riscv64/riscv64/mem.c
+++ b/sys/arch/riscv64/riscv64/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.3 2021/05/12 01:20:52 jsg Exp $	*/
+/*	$OpenBSD: mem.c,v 1.4 2021/05/14 06:48:52 jsg Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -73,17 +73,14 @@
  */
 
 #include <sys/param.h>
-#include <sys/conf.h>
 #include <sys/buf.h>
 #include <sys/filio.h>
 #include <sys/systm.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
-#include <sys/fcntl.h>
 #include <sys/rwlock.h>
 
-#include <machine/cpu.h>
 #include <machine/conf.h>
 
 #include <uvm/uvm_extern.h>
diff --git a/sys/arch/riscv64/riscv64/pmap.c b/sys/arch/riscv64/riscv64/pmap.c
index d48eb73a205..797b5c90b88 100644
--- a/sys/arch/riscv64/riscv64/pmap.c
+++ b/sys/arch/riscv64/riscv64/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.8 2021/05/13 19:26:25 kettenis Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.9 2021/05/14 06:48:52 jsg Exp $	*/
 
 /*
  * Copyright (c) 2019-2020 Brian Bamsch <bbamsch@google.com>
@@ -18,9 +18,7 @@
  */
 
 #include <sys/param.h>
-#include <sys/malloc.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/systm.h>
 #include <sys/pool.h>
 #include <sys/atomic.h>
@@ -30,13 +28,8 @@
 #include "machine/vmparam.h"
 #include "machine/pmap.h"
 #include "machine/cpufunc.h"
-#include "machine/pcb.h"
 #include "machine/riscvreg.h"
 
-#include <machine/db_machdep.h>
-#include <ddb/db_extern.h>
-#include <ddb/db_output.h>
-
 void pmap_set_satp(struct proc *);
 void pmap_free_asid(pmap_t);
 
diff --git a/sys/arch/riscv64/riscv64/process_machdep.c b/sys/arch/riscv64/riscv64/process_machdep.c
index a12cad96e60..ce0539f4ba7 100644
--- a/sys/arch/riscv64/riscv64/process_machdep.c
+++ b/sys/arch/riscv64/riscv64/process_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process_machdep.c,v 1.3 2021/05/12 01:20:52 jsg Exp $	*/
+/*	$OpenBSD: process_machdep.c,v 1.4 2021/05/14 06:48:52 jsg Exp $	*/
 
 /*
  * Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
@@ -48,7 +48,6 @@
 
 #include <machine/pcb.h>
 #include <machine/reg.h>
-#include <machine/riscvreg.h>
 
 int
 process_read_regs(struct proc *p, struct reg *regs)
diff --git a/sys/arch/riscv64/riscv64/sig_machdep.c b/sys/arch/riscv64/riscv64/sig_machdep.c
index 42ba59f322b..c4fe890e554 100644
--- a/sys/arch/riscv64/riscv64/sig_machdep.c
+++ b/sys/arch/riscv64/riscv64/sig_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sig_machdep.c,v 1.3 2021/05/12 01:20:52 jsg Exp $	*/
+/*	$OpenBSD: sig_machdep.c,v 1.4 2021/05/14 06:48:52 jsg Exp $	*/
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -72,7 +72,6 @@
 #include <sys/systm.h>
 #include <sys/user.h>
 
-#include <machine/riscvreg.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <machine/pcb.h>
diff --git a/sys/arch/riscv64/riscv64/syscall.c b/sys/arch/riscv64/riscv64/syscall.c
index 19ee7a1923d..61d1e2d9d63 100644
--- a/sys/arch/riscv64/riscv64/syscall.c
+++ b/sys/arch/riscv64/riscv64/syscall.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall.c,v 1.5 2021/05/13 19:26:25 kettenis Exp $	*/
+/*	$OpenBSD: syscall.c,v 1.6 2021/05/14 06:48:52 jsg Exp $	*/
 
 /*
  * Copyright (c) 2020 Brian Bamsch <bbamsch@google.com>
@@ -19,10 +19,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/signalvar.h>
 #include <sys/user.h>
-#include <sys/vnode.h>
-#include <sys/signal.h>
 #include <sys/syscall.h>
 #include <sys/syscall_mi.h>
 #include <sys/systm.h>
diff --git a/sys/arch/riscv64/riscv64/trap.c b/sys/arch/riscv64/riscv64/trap.c
index 968d2626387..372884d17ac 100644
--- a/sys/arch/riscv64/riscv64/trap.c
+++ b/sys/arch/riscv64/riscv64/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.8 2021/05/13 06:45:23 kettenis Exp $	*/
+/*	$OpenBSD: trap.c,v 1.9 2021/05/14 06:48:52 jsg Exp $	*/
 
 /*
  * Copyright (c) 2020 Shivam Waghela <shivamwaghela@gmail.com>
@@ -25,8 +25,6 @@
 #include <sys/user.h>
 #include <sys/signalvar.h>
 #include <sys/siginfo.h>
-#include <sys/syscall.h>
-#include <sys/syscall_mi.h>
 
 #include <machine/riscvreg.h>
 #include <machine/syscall.h>
diff --git a/sys/arch/riscv64/riscv64/vm_machdep.c b/sys/arch/riscv64/riscv64/vm_machdep.c
index 00a7ece822b..da05bd9c93b 100644
--- a/sys/arch/riscv64/riscv64/vm_machdep.c
+++ b/sys/arch/riscv64/riscv64/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.3 2021/05/12 01:20:52 jsg Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.4 2021/05/14 06:48:52 jsg Exp $	*/
 
 /*-
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
@@ -40,18 +40,12 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/malloc.h>
-#include <sys/vnode.h>
 #include <sys/buf.h>
 #include <sys/user.h>
-#include <sys/exec.h>
-#include <sys/ptrace.h>
-#include <sys/signalvar.h>
 
 #include <uvm/uvm_extern.h>
 
 #include <machine/cpu.h>
-#include <machine/reg.h>
 
 /*
  * Finish a fork operation, with process p2 nearly set up.
-- 
2.20.1