projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
drm_drv.c
diff --git
a/drivers/gpu/drm/drm_drv.c
b/drivers/gpu/drm/drm_drv.c
index d5b349d279f5ce04a2adaaeafe71e8b4ceb7468b..90288ec7c28420133d0deea13e3ba2f1f98d413c 100644
(file)
--- a/
drivers/gpu/drm/drm_drv.c
+++ b/
drivers/gpu/drm/drm_drv.c
@@
-481,9
+481,9
@@
long drm_ioctl(struct file *filp,
if (ioctl->flags & DRM_UNLOCKED)
retcode = func(dev, kdata, file_priv);
else {
-
lock_kernel(
);
+
mutex_lock(&drm_global_mutex
);
retcode = func(dev, kdata, file_priv);
-
unlock_kernel(
);
+
mutex_unlock(&drm_global_mutex
);
}
if (cmd & IOC_OUT) {
This page took
0.025218 seconds
and
5
git commands to generate.