summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/armv7/omap/ommmc.c3
-rw-r--r--sys/arch/sparc64/dev/stp_sbus.c3
-rw-r--r--sys/dev/acpi/dwiic_acpi.c3
-rw-r--r--sys/dev/cardbus/cardslot.c3
-rw-r--r--sys/dev/fdt/imxesdhc.c3
-rw-r--r--sys/dev/ic/dwiic.c3
-rw-r--r--sys/dev/ic/dwiicvar.h3
-rw-r--r--sys/dev/pci/drm/i915/intel_breadcrumbs.c1
-rw-r--r--sys/dev/pci/drm/include/drm/drmP.h3
-rw-r--r--sys/dev/pci/drm/include/linux/sched.h4
-rw-r--r--sys/dev/pci/drm/scheduler/gpu_scheduler.c2
-rw-r--r--sys/dev/pci/dwiic_pci.c3
-rw-r--r--sys/kern/kern_timeout.c3
-rw-r--r--sys/net/pf_ioctl.c4
-rw-r--r--sys/sys/kthread.h5
-rw-r--r--sys/ufs/mfs/mfs_vfsops.c3
-rw-r--r--sys/uvm/uvm_km.c3
-rw-r--r--sys/uvm/uvm_pmemrange.c4
18 files changed, 22 insertions, 34 deletions
diff --git a/sys/arch/armv7/omap/ommmc.c b/sys/arch/armv7/omap/ommmc.c
index 0797c492459..db558de130a 100644
--- a/sys/arch/armv7/omap/ommmc.c
+++ b/sys/arch/armv7/omap/ommmc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ommmc.c,v 1.32 2020/01/13 13:30:42 mpi Exp $ */
+/* $OpenBSD: ommmc.c,v 1.33 2020/02/18 12:13:39 mpi Exp $ */
/*
* Copyright (c) 2009 Dale Rahn <drahn@openbsd.org>
@@ -23,7 +23,6 @@
#include <sys/param.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/kthread.h>
#include <sys/malloc.h>
#include <sys/systm.h>
#include <machine/bus.h>
diff --git a/sys/arch/sparc64/dev/stp_sbus.c b/sys/arch/sparc64/dev/stp_sbus.c
index 9d55f6cf78e..bcec41f4449 100644
--- a/sys/arch/sparc64/dev/stp_sbus.c
+++ b/sys/arch/sparc64/dev/stp_sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: stp_sbus.c,v 1.10 2008/06/26 05:42:13 ray Exp $ */
+/* $OpenBSD: stp_sbus.c,v 1.11 2020/02/18 12:13:39 mpi Exp $ */
/* $NetBSD: stp4020.c,v 1.23 2002/06/01 23:51:03 lukem Exp $ */
/*-
@@ -42,7 +42,6 @@
#include <sys/extent.h>
#include <sys/proc.h>
#include <sys/kernel.h>
-#include <sys/kthread.h>
#include <sys/device.h>
#include <dev/pcmcia/pcmciareg.h>
diff --git a/sys/dev/acpi/dwiic_acpi.c b/sys/dev/acpi/dwiic_acpi.c
index 9ba51c73309..928cc588e7c 100644
--- a/sys/dev/acpi/dwiic_acpi.c
+++ b/sys/dev/acpi/dwiic_acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwiic_acpi.c,v 1.12 2019/08/04 15:44:17 kettenis Exp $ */
+/* $OpenBSD: dwiic_acpi.c,v 1.13 2020/02/18 12:13:39 mpi Exp $ */
/*
* Synopsys DesignWare I2C controller
*
@@ -20,7 +20,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/kthread.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c
index 1d42d20101d..a90ca275e86 100644
--- a/sys/dev/cardbus/cardslot.c
+++ b/sys/dev/cardbus/cardslot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cardslot.c,v 1.21 2016/09/15 02:00:17 dlg Exp $ */
+/* $OpenBSD: cardslot.c,v 1.22 2020/02/18 12:13:39 mpi Exp $ */
/* $NetBSD: cardslot.c,v 1.9 2000/03/22 09:35:06 haya Exp $ */
/*
@@ -34,7 +34,6 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/syslog.h>
-#include <sys/kthread.h>
#include <sys/pool.h>
#include <sys/task.h>
diff --git a/sys/dev/fdt/imxesdhc.c b/sys/dev/fdt/imxesdhc.c
index a6a19e999f2..1178ec7ccca 100644
--- a/sys/dev/fdt/imxesdhc.c
+++ b/sys/dev/fdt/imxesdhc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxesdhc.c,v 1.12 2020/01/13 13:30:00 mpi Exp $ */
+/* $OpenBSD: imxesdhc.c,v 1.13 2020/02/18 12:13:39 mpi Exp $ */
/*
* Copyright (c) 2009 Dale Rahn <drahn@openbsd.org>
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -22,7 +22,6 @@
#include <sys/param.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/kthread.h>
#include <sys/malloc.h>
#include <sys/systm.h>
#include <machine/bus.h>
diff --git a/sys/dev/ic/dwiic.c b/sys/dev/ic/dwiic.c
index 5bae719330c..b6750cf5069 100644
--- a/sys/dev/ic/dwiic.c
+++ b/sys/dev/ic/dwiic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwiic.c,v 1.9 2020/01/11 20:07:40 kettenis Exp $ */
+/* $OpenBSD: dwiic.c,v 1.10 2020/02/18 12:13:39 mpi Exp $ */
/*
* Synopsys DesignWare I2C controller
*
@@ -20,7 +20,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/kthread.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
diff --git a/sys/dev/ic/dwiicvar.h b/sys/dev/ic/dwiicvar.h
index 1c2e3c5faf0..275e652f917 100644
--- a/sys/dev/ic/dwiicvar.h
+++ b/sys/dev/ic/dwiicvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwiicvar.h,v 1.3 2019/03/16 02:40:43 jcs Exp $ */
+/* $OpenBSD: dwiicvar.h,v 1.4 2020/02/18 12:13:39 mpi Exp $ */
/*
* Synopsys DesignWare I2C controller
*
@@ -20,7 +20,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/kthread.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
diff --git a/sys/dev/pci/drm/i915/intel_breadcrumbs.c b/sys/dev/pci/drm/i915/intel_breadcrumbs.c
index ee379dfe847..dbf49df0b47 100644
--- a/sys/dev/pci/drm/i915/intel_breadcrumbs.c
+++ b/sys/dev/pci/drm/i915/intel_breadcrumbs.c
@@ -28,7 +28,6 @@
#else
#include <sys/types.h>
#include <sys/param.h>
-#include <sys/kthread.h>
#endif
#include "i915_drv.h"
diff --git a/sys/dev/pci/drm/include/drm/drmP.h b/sys/dev/pci/drm/include/drm/drmP.h
index 2481d867937..fa2938653a8 100644
--- a/sys/dev/pci/drm/include/drm/drmP.h
+++ b/sys/dev/pci/drm/include/drm/drmP.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: drmP.h,v 1.5 2019/08/18 13:11:47 kettenis Exp $ */
+/* $OpenBSD: drmP.h,v 1.6 2020/02/18 12:13:39 mpi Exp $ */
/* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*-
* Created: Mon Jan 4 10:05:05 1999 by faith@precisioninsight.com
*/
@@ -45,7 +45,6 @@
#include <sys/pool.h>
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/mutex.h>
#include <sys/tree.h>
diff --git a/sys/dev/pci/drm/include/linux/sched.h b/sys/dev/pci/drm/include/linux/sched.h
index 00fa85d4294..9def4c4be27 100644
--- a/sys/dev/pci/drm/include/linux/sched.h
+++ b/sys/dev/pci/drm/include/linux/sched.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sched.h,v 1.1 2019/04/14 10:14:53 jsg Exp $ */
+/* $OpenBSD: sched.h,v 1.2 2020/02/18 12:13:40 mpi Exp $ */
/*
* Copyright (c) 2013, 2014, 2015 Mark Kettenis
*
@@ -23,7 +23,6 @@
#include <sys/kernel.h>
#include <sys/stdint.h>
#include <sys/mutex.h>
-#include <sys/proc.h>
#include <linux/wait.h>
#include <linux/hrtimer.h>
@@ -47,6 +46,7 @@ long schedule_timeout(long);
#define io_schedule_timeout(x) schedule_timeout(x)
+struct proc;
int wake_up_process(struct proc *p);
#endif
diff --git a/sys/dev/pci/drm/scheduler/gpu_scheduler.c b/sys/dev/pci/drm/scheduler/gpu_scheduler.c
index 94646a4bdd9..b9d1a98f2a9 100644
--- a/sys/dev/pci/drm/scheduler/gpu_scheduler.c
+++ b/sys/dev/pci/drm/scheduler/gpu_scheduler.c
@@ -57,8 +57,6 @@
#define CREATE_TRACE_POINTS
#include "gpu_scheduler_trace.h"
-#include <sys/kthread.h>
-
#define to_drm_sched_job(sched_job) \
container_of((sched_job), struct drm_sched_job, queue_node)
diff --git a/sys/dev/pci/dwiic_pci.c b/sys/dev/pci/dwiic_pci.c
index d685e5dcc72..90f7d584706 100644
--- a/sys/dev/pci/dwiic_pci.c
+++ b/sys/dev/pci/dwiic_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwiic_pci.c,v 1.9 2019/07/31 16:04:16 jcs Exp $ */
+/* $OpenBSD: dwiic_pci.c,v 1.10 2020/02/18 12:13:40 mpi Exp $ */
/*
* Synopsys DesignWare I2C controller
* PCI attachment
@@ -21,7 +21,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/kthread.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 39523479ce5..eab14f2da7b 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_timeout.c,v 1.71 2020/01/13 09:51:52 mpi Exp $ */
+/* $OpenBSD: kern_timeout.c,v 1.72 2020/02/18 12:13:40 mpi Exp $ */
/*
* Copyright (c) 2001 Thomas Nordin <nordin@openbsd.org>
* Copyright (c) 2000-2001 Artur Grabowski <art@openbsd.org>
@@ -28,6 +28,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kthread.h>
+#include <sys/proc.h>
#include <sys/timeout.h>
#include <sys/mutex.h>
#include <sys/kernel.h>
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index fc6d3c0effb..e1810afe156 100644
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_ioctl.c,v 1.348 2020/01/08 21:48:59 bluhm Exp $ */
+/* $OpenBSD: pf_ioctl.c,v 1.349 2020/02/18 12:13:40 mpi Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -51,7 +51,7 @@
#include <sys/timeout.h>
#include <sys/pool.h>
#include <sys/malloc.h>
-#include <sys/kthread.h>
+#include <sys/proc.h>
#include <sys/rwlock.h>
#include <sys/syslog.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/sys/kthread.h b/sys/sys/kthread.h
index 851f2ff490a..b640045ba5f 100644
--- a/sys/sys/kthread.h
+++ b/sys/sys/kthread.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kthread.h,v 1.6 2013/11/18 20:21:51 deraadt Exp $ */
+/* $OpenBSD: kthread.h,v 1.7 2020/02/18 12:13:40 mpi Exp $ */
/* $NetBSD: kthread.h,v 1.2 1998/11/14 00:08:49 thorpej Exp $ */
/*-
@@ -39,8 +39,7 @@
*/
#ifdef _KERNEL
-#include <sys/proc.h> /* struct proc, tsleep(), wakeup() */
-
+struct proc;
int kthread_create(void (*)(void *), void *, struct proc **,
const char *);
void kthread_create_deferred(void (*)(void *), void *);
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index 83dc83b87c5..340e3fae531 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfs_vfsops.c,v 1.58 2020/02/14 17:03:42 claudio Exp $ */
+/* $OpenBSD: mfs_vfsops.c,v 1.59 2020/02/18 12:13:40 mpi Exp $ */
/* $NetBSD: mfs_vfsops.c,v 1.10 1996/02/09 22:31:28 christos Exp $ */
/*
@@ -41,7 +41,6 @@
#include <sys/signalvar.h>
#include <sys/vnode.h>
#include <sys/malloc.h>
-#include <sys/kthread.h>
#include <ufs/ufs/quota.h>
#include <ufs/ufs/inode.h>
diff --git a/sys/uvm/uvm_km.c b/sys/uvm/uvm_km.c
index d616086f643..cf5fca0e957 100644
--- a/sys/uvm/uvm_km.c
+++ b/sys/uvm/uvm_km.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_km.c,v 1.135 2019/12/30 23:58:38 jsg Exp $ */
+/* $OpenBSD: uvm_km.c,v 1.136 2020/02/18 12:13:40 mpi Exp $ */
/* $NetBSD: uvm_km.c,v 1.42 2001/01/14 02:10:01 thorpej Exp $ */
/*
@@ -131,6 +131,7 @@
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/proc.h>
#include <sys/kthread.h>
#include <uvm/uvm.h>
diff --git a/sys/uvm/uvm_pmemrange.c b/sys/uvm/uvm_pmemrange.c
index db3b4ccaee5..d8b0af33533 100644
--- a/sys/uvm/uvm_pmemrange.c
+++ b/sys/uvm/uvm_pmemrange.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_pmemrange.c,v 1.58 2020/01/01 01:50:00 beck Exp $ */
+/* $OpenBSD: uvm_pmemrange.c,v 1.59 2020/02/18 12:13:40 mpi Exp $ */
/*
* Copyright (c) 2009, 2010 Ariane van der Steldt <ariane@stack.nl>
@@ -21,7 +21,7 @@
#include <uvm/uvm.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/kthread.h>
+#include <sys/proc.h>
#include <sys/mount.h>
/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 03:24:37 +0000