From 961a6190d102da25db608fb45db171360f4a9541 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fran=C3=A7ois=20Tigeot?= <ftigeot@wolfpond.org>
Date: Fri, 23 Oct 2015 21:58:55 +0200
Subject: [PATCH] drm: Add linux/lockdep.h

---
 sys/dev/drm/include/linux/device.h            |  4 +++-
 sys/dev/drm/include/linux/fs.h                |  1 +
 sys/dev/drm/include/linux/{fs.h => lockdep.h} | 12 ++++++++----
 sys/dev/drm/include/linux/mutex.h             |  1 +
 sys/dev/drm/include/linux/workqueue.h         |  1 +
 5 files changed, 14 insertions(+), 5 deletions(-)
 copy sys/dev/drm/include/linux/{fs.h => lockdep.h} (88%)

diff --git a/sys/dev/drm/include/linux/device.h b/sys/dev/drm/include/linux/device.h
index b92816f705..2d8d0a2ce2 100644
--- a/sys/dev/drm/include/linux/device.h
+++ b/sys/dev/drm/include/linux/device.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 François Tigeot
+ * Copyright (c) 2014-2015 François Tigeot
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,6 +27,8 @@
 #ifndef	_LINUX_DEVICE_H_
 #define	_LINUX_DEVICE_H_
 
+#include <linux/lockdep.h>
+
 #define	dev_err(dev, fmt, ...)						\
 	device_printf((dev), "error: " fmt, ## __VA_ARGS__)
 #define	dev_warn(dev, fmt, ...)						\
diff --git a/sys/dev/drm/include/linux/fs.h b/sys/dev/drm/include/linux/fs.h
index 373e0fd1e5..149d0b065d 100644
--- a/sys/dev/drm/include/linux/fs.h
+++ b/sys/dev/drm/include/linux/fs.h
@@ -28,5 +28,6 @@
 #define _LINUX_FS_H_
 
 #include <linux/rculist.h>
+#include <linux/lockdep.h>
 
 #endif	/* _LINUX_FS_H_ */
diff --git a/sys/dev/drm/include/linux/fs.h b/sys/dev/drm/include/linux/lockdep.h
similarity index 88%
copy from sys/dev/drm/include/linux/fs.h
copy to sys/dev/drm/include/linux/lockdep.h
index 373e0fd1e5..746434bcf7 100644
--- a/sys/dev/drm/include/linux/fs.h
+++ b/sys/dev/drm/include/linux/lockdep.h
@@ -24,9 +24,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_FS_H_
-#define _LINUX_FS_H_
+#ifndef _LINUX_LOCKDEP_H_
+#define _LINUX_LOCKDEP_H_
 
-#include <linux/rculist.h>
+static inline void
+lockdep_assert_held(struct lock *l)
+{
+	/* XXX: This function does nothing */
+}
 
-#endif	/* _LINUX_FS_H_ */
+#endif	/* _LINUX_LOCKDEP_H_ */
diff --git a/sys/dev/drm/include/linux/mutex.h b/sys/dev/drm/include/linux/mutex.h
index 02f2c0b376..8bbb90d6a6 100644
--- a/sys/dev/drm/include/linux/mutex.h
+++ b/sys/dev/drm/include/linux/mutex.h
@@ -28,6 +28,7 @@
 #define _LINUX_MUTEX_H_
 
 #include <sys/lock.h>
+#include <linux/lockdep.h>
 
 #define mutex_is_locked(lock)	(lockcount(lock) != 0)
 
diff --git a/sys/dev/drm/include/linux/workqueue.h b/sys/dev/drm/include/linux/workqueue.h
index f365e57864..2aba9ad6fc 100644
--- a/sys/dev/drm/include/linux/workqueue.h
+++ b/sys/dev/drm/include/linux/workqueue.h
@@ -36,6 +36,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/timer.h>
+#include <linux/lockdep.h>
 
 #include <sys/taskqueue.h>
 
-- 
2.11.4.GIT