diff options
author | Dave Airlie <airlied@linux.ie> | 2008-04-26 04:21:28 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2008-04-26 04:21:28 -0400 |
commit | b74e2082f8e7b8f37af3fc39e8ee0dd0d218c589 (patch) | |
tree | 9744fb62172e07de2ae60153f73404f800fe14a9 /drivers/char | |
parent | ac741ab71bb39e6977694ac0cc26678d8673cda4 (diff) |
drm: _end is shadowing real _end, just rename it.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/drm/drm_fops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c index df7bf48be692..68f0da801ed8 100644 --- a/drivers/char/drm/drm_fops.c +++ b/drivers/char/drm/drm_fops.c | |||
@@ -345,7 +345,7 @@ int drm_release(struct inode *inode, struct file *filp) | |||
345 | if (drm_i_have_hw_lock(dev, file_priv)) { | 345 | if (drm_i_have_hw_lock(dev, file_priv)) { |
346 | dev->driver->reclaim_buffers_locked(dev, file_priv); | 346 | dev->driver->reclaim_buffers_locked(dev, file_priv); |
347 | } else { | 347 | } else { |
348 | unsigned long _end=jiffies + 3*DRM_HZ; | 348 | unsigned long endtime = jiffies + 3 * DRM_HZ; |
349 | int locked = 0; | 349 | int locked = 0; |
350 | 350 | ||
351 | drm_idlelock_take(&dev->lock); | 351 | drm_idlelock_take(&dev->lock); |
@@ -363,7 +363,7 @@ int drm_release(struct inode *inode, struct file *filp) | |||
363 | if (locked) | 363 | if (locked) |
364 | break; | 364 | break; |
365 | schedule(); | 365 | schedule(); |
366 | } while (!time_after_eq(jiffies, _end)); | 366 | } while (!time_after_eq(jiffies, endtime)); |
367 | 367 | ||
368 | if (!locked) { | 368 | if (!locked) { |
369 | DRM_ERROR("reclaim_buffers_locked() deadlock. Please rework this\n" | 369 | DRM_ERROR("reclaim_buffers_locked() deadlock. Please rework this\n" |