projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ac741ab
)
drm: _end is shadowing real _end, just rename it.
author
Dave Airlie
<
[email protected]
>
Sat, 26 Apr 2008 08:21:28 +0000
(18:21 +1000)
committer
Dave Airlie
<
[email protected]
>
Sat, 26 Apr 2008 08:21:28 +0000
(18:21 +1000)
Signed-off-by: Dave Airlie <
[email protected]
>
drivers/char/drm/drm_fops.c
patch
|
blob
|
history
diff --git
a/drivers/char/drm/drm_fops.c
b/drivers/char/drm/drm_fops.c
index df7bf48be6923192c0a9c1666c0e3126db2d711b..68f0da801ed82b579efc5fcc3a94c6b755536f1c 100644
(file)
--- 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"