Module Name: src
Committed By: riastradh
Date: Sun Dec 19 10:38:05 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_mode.h
src/sys/external/bsd/drm2/dist/include/drm: drm_dp_helper.h
src/sys/external/bsd/drm2/include/linux: device.h hrtimer.h sched.h
timer.h
Log Message:
Revert "Give up on finding how linux side-loads these"
Found it.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_mode.h
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/include/drm/drm_dp_helper.h
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/include/linux/device.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/linux/hrtimer.h
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/include/linux/sched.h
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/include/linux/timer.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_mode.h
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_mode.h:1.7 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_mode.h:1.8
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_mode.h:1.7 Sun Dec 19 10:37:18 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_mode.h Sun Dec 19 10:38:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_mode.h,v 1.7 2021/12/19 10:37:18 riastradh Exp $ */
+/* $NetBSD: radeon_mode.h,v 1.8 2021/12/19 10:38:05 riastradh Exp $ */
/*
* Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
@@ -41,7 +41,6 @@
#include <drm/drm_crtc_helper.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
-#include <linux/ktime.h>
struct radeon_bo;
struct radeon_device;
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_dp_helper.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_dp_helper.h:1.6 src/sys/external/bsd/drm2/dist/include/drm/drm_dp_helper.h:1.7
--- src/sys/external/bsd/drm2/dist/include/drm/drm_dp_helper.h:1.6 Sun Dec 19 10:37:18 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_dp_helper.h Sun Dec 19 10:38:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_dp_helper.h,v 1.6 2021/12/19 10:37:18 riastradh Exp $ */
+/* $NetBSD: drm_dp_helper.h,v 1.7 2021/12/19 10:38:05 riastradh Exp $ */
/*
* Copyright © 2008 Keith Packard
@@ -27,7 +27,6 @@
#include <linux/delay.h>
#include <linux/i2c.h>
-#include <linux/seq_file.h>
#include <linux/types.h>
#include <linux/workqueue.h>
Index: src/sys/external/bsd/drm2/include/linux/device.h
diff -u src/sys/external/bsd/drm2/include/linux/device.h:1.11 src/sys/external/bsd/drm2/include/linux/device.h:1.12
--- src/sys/external/bsd/drm2/include/linux/device.h:1.11 Sun Dec 19 10:36:07 2021
+++ src/sys/external/bsd/drm2/include/linux/device.h Sun Dec 19 10:38:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.11 2021/12/19 10:36:07 riastradh Exp $ */
+/* $NetBSD: device.h,v 1.12 2021/12/19 10:38:05 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -36,6 +36,7 @@
#include <sys/device.h>
#include <sys/systm.h>
+#include <linux/hrtimer.h>
#include <linux/ratelimit.h>
#define dev_crit(DEV, FMT, ...) do { \
Index: src/sys/external/bsd/drm2/include/linux/hrtimer.h
diff -u src/sys/external/bsd/drm2/include/linux/hrtimer.h:1.2 src/sys/external/bsd/drm2/include/linux/hrtimer.h:1.3
--- src/sys/external/bsd/drm2/include/linux/hrtimer.h:1.2 Sun Dec 19 01:19:07 2021
+++ src/sys/external/bsd/drm2/include/linux/hrtimer.h Sun Dec 19 10:38:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hrtimer.h,v 1.2 2021/12/19 01:19:07 riastradh Exp $ */
+/* $NetBSD: hrtimer.h,v 1.3 2021/12/19 10:38:05 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#ifndef _LINUX_HRTIMER_H_
#define _LINUX_HRTIMER_H_
+#include <linux/timer.h>
+
struct hrtimer {
};
Index: src/sys/external/bsd/drm2/include/linux/sched.h
diff -u src/sys/external/bsd/drm2/include/linux/sched.h:1.17 src/sys/external/bsd/drm2/include/linux/sched.h:1.18
--- src/sys/external/bsd/drm2/include/linux/sched.h:1.17 Sun Dec 19 01:51:27 2021
+++ src/sys/external/bsd/drm2/include/linux/sched.h Sun Dec 19 10:38:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sched.h,v 1.17 2021/12/19 01:51:27 riastradh Exp $ */
+/* $NetBSD: sched.h,v 1.18 2021/12/19 10:38:05 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -40,8 +40,11 @@
#include <asm/param.h>
#include <asm/barrier.h>
#include <asm/processor.h>
+#include <linux/device.h>
#include <linux/errno.h>
+struct seq_file;
+
#define TASK_COMM_LEN MAXCOMLEN
#define MAX_SCHEDULE_TIMEOUT (INT_MAX/2) /* paranoia */
Index: src/sys/external/bsd/drm2/include/linux/timer.h
diff -u src/sys/external/bsd/drm2/include/linux/timer.h:1.9 src/sys/external/bsd/drm2/include/linux/timer.h:1.10
--- src/sys/external/bsd/drm2/include/linux/timer.h:1.9 Sun Dec 19 01:55:29 2021
+++ src/sys/external/bsd/drm2/include/linux/timer.h Sun Dec 19 10:38:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: timer.h,v 1.9 2021/12/19 01:55:29 riastradh Exp $ */
+/* $NetBSD: timer.h,v 1.10 2021/12/19 10:38:05 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -42,6 +42,7 @@
#include <sys/callout.h>
#include <linux/jiffies.h>
+#include <linux/ktime.h>
struct timer_list {
struct callout tl_callout;
