Skip to content

L
linux
Commit b74e2082 authored by Dave Airlie's avatar Dave Airlie
Browse files
Options

drm: _end is shadowing real _end, just rename it. 

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent ac741ab7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/char/drm/drm_fops.c
View file @ b74e2082
...@@ -345,7 +345,7 @@ int drm_release(struct inode *inode, struct file *filp) ...@@ -345,7 +345,7 @@ int drm_release(struct inode *inode, struct file *filp)
if (drm_i_have_hw_lock(dev, file_priv)) { if (drm_i_have_hw_lock(dev, file_priv)) {
dev->driver->reclaim_buffers_locked(dev, file_priv); dev->driver->reclaim_buffers_locked(dev, file_priv);
} else { } else {
unsigned long _end=jiffies + 3*DRM_HZ; unsigned long endtime = jiffies + 3 * DRM_HZ;
int locked = 0; int locked = 0;
drm_idlelock_take(&dev->lock); drm_idlelock_take(&dev->lock);
...@@ -363,7 +363,7 @@ int drm_release(struct inode *inode, struct file *filp) ...@@ -363,7 +363,7 @@ int drm_release(struct inode *inode, struct file *filp)
if (locked) if (locked)
break; break;
schedule(); schedule();
} while (!time_after_eq(jiffies, _end)); } while (!time_after_eq(jiffies, endtime));
if (!locked) { if (!locked) {
DRM_ERROR("reclaim_buffers_locked() deadlock. Please rework this\n" DRM_ERROR("reclaim_buffers_locked() deadlock. Please rework this\n"
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7