summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-09-10 12:43:54 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-09-12 11:19:47 +0200
commit44af3f5c6a2dc0358121b5ecf272361b3290649e (patch)
tree1177a0cc532420d159b8aab863c7578a0b320802
parent67d0ec4e885cd2af861a14bb9bd59fd23e9644ae (diff)
downloadop-kernel-dev-44af3f5c6a2dc0358121b5ecf272361b3290649e.zip
op-kernel-dev-44af3f5c6a2dc0358121b5ecf272361b3290649e.tar.gz
drm: unexport drm_global_mutex
Drivers really, really have no business even looking at this lock. And thankfully they don't. So unexport it and move the declaration to drm_internal.h. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/drm_fops.c1
-rw-r--r--drivers/gpu/drm/drm_internal.h1
-rw-r--r--drivers/gpu/drm/drm_lock.c1
-rw-r--r--include/drm/drmP.h1
4 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 51a77a7..3e66946 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -43,7 +43,6 @@
/* from BKL pushdown */
DEFINE_MUTEX(drm_global_mutex);
-EXPORT_SYMBOL(drm_global_mutex);
static int drm_open_helper(struct file *filp, struct drm_minor *minor);
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
index a71cf4b..d6dc755 100644
--- a/drivers/gpu/drm/drm_internal.h
+++ b/drivers/gpu/drm/drm_internal.h
@@ -25,6 +25,7 @@
extern unsigned int drm_timestamp_monotonic;
/* drm_fops.c */
+extern struct mutex drm_global_mutex;
int drm_lastclose(struct drm_device *dev);
/* drm_pci.c */
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index 727b032..f861361 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -36,6 +36,7 @@
#include <linux/export.h>
#include <drm/drmP.h>
#include "drm_legacy.h"
+#include "drm_internal.h"
static int drm_notifier(void *priv);
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 5219887..ef675db 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1087,7 +1087,6 @@ extern long drm_compat_ioctl(struct file *filp,
extern bool drm_ioctl_flags(unsigned int nr, unsigned int *flags);
/* Device support (drm_fops.h) */
-extern struct mutex drm_global_mutex;
extern int drm_open(struct inode *inode, struct file *filp);
extern ssize_t drm_read(struct file *filp, char __user *buffer,
size_t count, loff_t *offset);
OpenPOWER on IntegriCloud