From: Dave Airlie <airlied@linux.ie>
Date: Sat, 26 Apr 2008 08:21:28 +0000 (+1000)
Subject: drm: _end is shadowing real _end, just rename it.
X-Git-Tag: v2.6.26-rc1~1048^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b74e2082f8e7b8f37af3fc39e8ee0dd0d218c589;p=linux-2.6-omap-h63xx.git

drm: _end is shadowing real _end, just rename it.

Signed-off-by: Dave Airlie <airlied@linux.ie>
---

diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c
index df7bf48be69..68f0da801ed 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"