diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-04-26 08:21:28 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-04-26 08:21:28 (GMT) |
| commit | b74e2082f8e7b8f37af3fc39e8ee0dd0d218c589 (patch) | |
| tree | 9744fb62172e07de2ae60153f73404f800fe14a9 | |
| parent | ac741ab71bb39e6977694ac0cc26678d8673cda4 (diff) | |
| download | linux-b74e2082f8e7b8f37af3fc39e8ee0dd0d218c589.tar.xz | |
drm: _end is shadowing real _end, just rename it.
Signed-off-by: Dave Airlie <airlied@linux.ie>
| -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 df7bf48..68f0da8 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) 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); @@ -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" |