Skip to content

Commit

Permalink
drm: _end is shadowing real _end, just rename it.
Browse files Browse the repository at this point in the history
Signed-off-by: Dave Airlie <airlied@linux.ie>
  • Loading branch information
Dave Airlie committed Apr 26, 2008
1 parent ac741ab commit b74e208
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/char/drm/drm_fops.c
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ int drm_release(struct inode *inode, struct file *filp)
if (drm_i_have_hw_lock(dev, file_priv)) {
dev->driver->reclaim_buffers_locked(dev, file_priv);
} else {
unsigned long _end=jiffies + 3*DRM_HZ;
unsigned long endtime = jiffies + 3 * DRM_HZ;
int locked = 0;

drm_idlelock_take(&dev->lock);
Expand All @@ -363,7 +363,7 @@ int drm_release(struct inode *inode, struct file *filp)
if (locked)
break;
schedule();
} while (!time_after_eq(jiffies, _end));
} while (!time_after_eq(jiffies, endtime));

if (!locked) {
DRM_ERROR("reclaim_buffers_locked() deadlock. Please rework this\n"
Expand Down

0 comments on commit b74e208

Please sign in to comment.