Skip to content

L
linux-davinci
Commit 70ffa16e authored by Jonathan Corbet's avatar Jonathan Corbet
Browse files
Options

drm: cdev lock_kernel() pushdown 

Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
parent abedd296
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
drivers/char/drm/drm_fops.c
View file @ 70ffa16e
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "drmP.h" #include "drmP.h"
#include "drm_sarea.h" #include "drm_sarea.h"
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/smp_lock.h>
static int drm_open_helper(struct inode *inode, struct file *filp, static int drm_open_helper(struct inode *inode, struct file *filp,
struct drm_device * dev); struct drm_device * dev);
...@@ -174,12 +175,14 @@ int drm_stub_open(struct inode *inode, struct file *filp) ...@@ -174,12 +175,14 @@ int drm_stub_open(struct inode *inode, struct file *filp)
DRM_DEBUG("\n"); DRM_DEBUG("\n");
/* BKL pushdown: note that nothing else serializes idr_find() */
lock_kernel();
minor = idr_find(&drm_minors_idr, minor_id); minor = idr_find(&drm_minors_idr, minor_id);
if (!minor) if (!minor)
return -ENODEV; goto out;
if (!(dev = minor->dev)) if (!(dev = minor->dev))
return -ENODEV; goto out;
old_fops = filp->f_op; old_fops = filp->f_op;
filp->f_op = fops_get(&dev->driver->fops); filp->f_op = fops_get(&dev->driver->fops);
...@@ -189,6 +192,8 @@ int drm_stub_open(struct inode *inode, struct file *filp) ...@@ -189,6 +192,8 @@ int drm_stub_open(struct inode *inode, struct file *filp)
} }
fops_put(old_fops); fops_put(old_fops);
out:
unlock_kernel();
return err; return err;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment