summaryrefslogtreecommitdiff
path: root/sys/external/bsd/drm2/include/linux
diff options
context:
space:
mode:
authormaya <maya@NetBSD.org>2020-02-14 14:34:57 +0000
committermaya <maya@NetBSD.org>2020-02-14 14:34:57 +0000
commit1b0774804d8a445a122b0d4293d2cbe95e7cf151 (patch)
tree8d9ae447283dc331819f4aa334c35b1f4702613d /sys/external/bsd/drm2/include/linux
parent084f788a2f6609b1b9d7b2dbbbcd66b9dbc6bf1e (diff)
Reduce diffs by side-loading some header files like Linux.
From riastradh
Diffstat (limited to 'sys/external/bsd/drm2/include/linux')
-rw-r--r--sys/external/bsd/drm2/include/linux/atomic.h4
-rw-r--r--sys/external/bsd/drm2/include/linux/fs.h3
-rw-r--r--sys/external/bsd/drm2/include/linux/interrupt.h4
-rw-r--r--sys/external/bsd/drm2/include/linux/jiffies.h6
-rw-r--r--sys/external/bsd/drm2/include/linux/ktime.h3
-rw-r--r--sys/external/bsd/drm2/include/linux/mm_types.h4
-rw-r--r--sys/external/bsd/drm2/include/linux/mutex.h5
-rw-r--r--sys/external/bsd/drm2/include/linux/pci.h5
-rw-r--r--sys/external/bsd/drm2/include/linux/pm_qos.h4
-rw-r--r--sys/external/bsd/drm2/include/linux/pm_runtime.h4
10 files changed, 32 insertions, 10 deletions
diff --git a/sys/external/bsd/drm2/include/linux/atomic.h b/sys/external/bsd/drm2/include/linux/atomic.h
index e509157c1aa..b2e7e587938 100644
--- a/sys/external/bsd/drm2/include/linux/atomic.h
+++ b/sys/external/bsd/drm2/include/linux/atomic.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic.h,v 1.21 2019/09/28 12:34:56 christos Exp $ */
+/* $NetBSD: atomic.h,v 1.22 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -36,6 +36,8 @@
#include <machine/limits.h>
+#include <asm/barrier.h>
+
#if defined(MULTIPROCESSOR) && !defined(__HAVE_ATOMIC_AS_MEMBAR)
# define smp_mb__before_atomic() membar_exit()
# define smp_mb__after_atomic() membar_enter()
diff --git a/sys/external/bsd/drm2/include/linux/fs.h b/sys/external/bsd/drm2/include/linux/fs.h
index 6ded5a90c89..8a134179365 100644
--- a/sys/external/bsd/drm2/include/linux/fs.h
+++ b/sys/external/bsd/drm2/include/linux/fs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fs.h,v 1.3 2020/02/14 04:36:56 riastradh Exp $ */
+/* $NetBSD: fs.h,v 1.4 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -33,5 +33,6 @@
#define _LINUX_FS_H_
#include <linux/capability.h>
+#include <linux/err.h>
#endif /* _LINUX_FS_H_ */
diff --git a/sys/external/bsd/drm2/include/linux/interrupt.h b/sys/external/bsd/drm2/include/linux/interrupt.h
index dcb8bd7a2dd..dec6082a7d3 100644
--- a/sys/external/bsd/drm2/include/linux/interrupt.h
+++ b/sys/external/bsd/drm2/include/linux/interrupt.h
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.h,v 1.3 2018/08/27 07:20:16 riastradh Exp $ */
+/* $NetBSD: interrupt.h,v 1.4 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,6 +34,8 @@
#include <sys/cpu.h>
+#include <linux/hardirq.h>
+
#define in_interrupt() (cpu_intr_p() || cpu_softintr_p())
#endif /* _LINUX_INTERRUPT_H_ */
diff --git a/sys/external/bsd/drm2/include/linux/jiffies.h b/sys/external/bsd/drm2/include/linux/jiffies.h
index 10c4a0b28c3..a813bf9f2ce 100644
--- a/sys/external/bsd/drm2/include/linux/jiffies.h
+++ b/sys/external/bsd/drm2/include/linux/jiffies.h
@@ -1,4 +1,4 @@
-/* $NetBSD: jiffies.h,v 1.12 2018/08/27 13:57:50 riastradh Exp $ */
+/* $NetBSD: jiffies.h,v 1.13 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -35,6 +35,10 @@
#include <sys/param.h>
#include <sys/kernel.h>
+#include <asm/param.h> /* HZ */
+
+#include <linux/math64.h>
+
#define jiffies hardclock_ticks
#define jiffies_64 hardclock_ticks /* XXX */
diff --git a/sys/external/bsd/drm2/include/linux/ktime.h b/sys/external/bsd/drm2/include/linux/ktime.h
index 11b227bd345..6e7c9124265 100644
--- a/sys/external/bsd/drm2/include/linux/ktime.h
+++ b/sys/external/bsd/drm2/include/linux/ktime.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ktime.h,v 1.8 2020/01/02 15:42:26 thorpej Exp $ */
+/* $NetBSD: ktime.h,v 1.9 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,6 +37,7 @@
#include <sys/kernel.h>
#include <sys/time.h>
+#include <linux/jiffies.h>
#include <linux/time.h>
union ktime {
diff --git a/sys/external/bsd/drm2/include/linux/mm_types.h b/sys/external/bsd/drm2/include/linux/mm_types.h
index de3cc794690..f90adc2f293 100644
--- a/sys/external/bsd/drm2/include/linux/mm_types.h
+++ b/sys/external/bsd/drm2/include/linux/mm_types.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mm_types.h,v 1.4 2014/07/16 20:59:58 riastradh Exp $ */
+/* $NetBSD: mm_types.h,v 1.5 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,6 +34,8 @@
#include <uvm/uvm_page.h> /* XXX don't expose this */
+#include <linux/rwsem.h>
+
struct page {
struct vm_page p_vmp;
};
diff --git a/sys/external/bsd/drm2/include/linux/mutex.h b/sys/external/bsd/drm2/include/linux/mutex.h
index 22e42b55c11..fc1693c3fb0 100644
--- a/sys/external/bsd/drm2/include/linux/mutex.h
+++ b/sys/external/bsd/drm2/include/linux/mutex.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.11 2018/08/27 07:34:03 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.12 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -35,6 +35,9 @@
#include <sys/mutex.h>
#include <lib/libkern/libkern.h> /* KASSERT */
+
+#include <asm/processor.h>
+
#include <linux/list.h>
#define __acquires(lock) /* XXX lockdep stuff */
diff --git a/sys/external/bsd/drm2/include/linux/pci.h b/sys/external/bsd/drm2/include/linux/pci.h
index a3dacd373ea..e7b5c220887 100644
--- a/sys/external/bsd/drm2/include/linux/pci.h
+++ b/sys/external/bsd/drm2/include/linux/pci.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.h,v 1.38 2020/01/18 03:00:04 jmcneill Exp $ */
+/* $NetBSD: pci.h,v 1.39 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -61,7 +61,10 @@
struct acpi_devnode;
#endif
+#include <linux/device.h>
#include <linux/dma-mapping.h>
+#include <linux/errno.h>
+#include <linux/io.h>
#include <linux/ioport.h>
#include <linux/kernel.h>
diff --git a/sys/external/bsd/drm2/include/linux/pm_qos.h b/sys/external/bsd/drm2/include/linux/pm_qos.h
index d47e2bb84e8..52d2df0db51 100644
--- a/sys/external/bsd/drm2/include/linux/pm_qos.h
+++ b/sys/external/bsd/drm2/include/linux/pm_qos.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pm_qos.h,v 1.1 2014/07/16 20:56:25 riastradh Exp $ */
+/* $NetBSD: pm_qos.h,v 1.2 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _LINUX_PM_QOS_H_
#define _LINUX_PM_QOS_H_
+#include <linux/notifier.h>
+
struct pm_qos_request {
char dummy;
};
diff --git a/sys/external/bsd/drm2/include/linux/pm_runtime.h b/sys/external/bsd/drm2/include/linux/pm_runtime.h
index 048105b61c1..110e11ac472 100644
--- a/sys/external/bsd/drm2/include/linux/pm_runtime.h
+++ b/sys/external/bsd/drm2/include/linux/pm_runtime.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pm_runtime.h,v 1.4 2018/08/27 07:30:00 riastradh Exp $ */
+/* $NetBSD: pm_runtime.h,v 1.5 2020/02/14 14:34:59 maya Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _LINUX_PM_RUNTIME_H_
#define _LINUX_PM_RUNTIME_H_
+#include <linux/notifier.h>
+
struct device;
static inline void