summaryrefslogtreecommitdiffstats
path: root/sys/dev/pci
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2020-02-18 12:13:39 +0000
committermpi <mpi@openbsd.org>2020-02-18 12:13:39 +0000
commit63cf9471a61d4f7a002fa265fd31e4f833fe840f (patch)
tree9f62d5dcd24d058a22ed868e12b20db039a5fd2a /sys/dev/pci
parenthave description of -Q match reality (diff)
downloadwireguard-openbsd-63cf9471a61d4f7a002fa265fd31e4f833fe840f.tar.xz
wireguard-openbsd-63cf9471a61d4f7a002fa265fd31e4f833fe840f.zip
Cleanup <sys/kthread.h> and <sys/proc.h> includes.
Do not include <sys/kthread.h> where it is not needed and stop including <sys/proc.h> in it. ok visa@, anton@
Diffstat (limited to 'sys/dev/pci')
-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
5 files changed, 4 insertions, 9 deletions
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>