From 05028f49c25ed85df010083729d74af23f3bb476 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 26 Apr 2008 18:21:28 +1000 Subject: [PATCH] --- yaml --- r: 93497 b: refs/heads/master c: b74e2082f8e7b8f37af3fc39e8ee0dd0d218c589 h: refs/heads/master i: 93495: 386e2964be3c761d9bea2a312bbe980e9a9db3b0 v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/drm_fops.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5b0c6dd7fb00..bcb375032f4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac741ab71bb39e6977694ac0cc26678d8673cda4 +refs/heads/master: b74e2082f8e7b8f37af3fc39e8ee0dd0d218c589 diff --git a/trunk/drivers/char/drm/drm_fops.c b/trunk/drivers/char/drm/drm_fops.c index df7bf48be692..68f0da801ed8 100644 --- a/trunk/drivers/char/drm/drm_fops.c +++ b/trunk/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"