diff options
author | Eric Anholt <eric@anholt.net> | 2008-05-30 14:42:08 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2008-05-30 14:42:08 -0700 |
commit | 461bfa3da6f85b85c21cd84f81bb4eefa5481418 (patch) | |
tree | 33e91c8cd024f67922670f9ed6565ceda1e4f3b5 /linux-core/drm_fops.c | |
parent | 50bce2bc625deb439dd61f504496dddd0cd4f572 (diff) | |
parent | 6e8a2cff66ac0d6afaf9bb233bc81449c2014078 (diff) |
Merge commit 'origin/master' into drm-gem
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_drv.h
shared-core/nouveau_state.c
Diffstat (limited to 'linux-core/drm_fops.c')
-rw-r--r-- | linux-core/drm_fops.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c index c42bfaab..ec521101 100644 --- a/linux-core/drm_fops.c +++ b/linux-core/drm_fops.c @@ -376,7 +376,6 @@ int drm_release(struct inode *inode, struct file *filp) struct drm_file *file_priv = filp->private_data; struct drm_device *dev = file_priv->minor->dev; int retcode = 0; - unsigned long irqflags; lock_kernel(); @@ -407,11 +406,9 @@ int drm_release(struct inode *inode, struct file *filp) */ do{ - spin_lock_irqsave(&dev->lock.spinlock, - irqflags); + spin_lock_bh(&dev->lock.spinlock); locked = dev->lock.idle_has_lock; - spin_unlock_irqrestore(&dev->lock.spinlock, - irqflags); + spin_unlock_bh(&dev->lock.spinlock); if (locked) break; schedule(); |