From b58dc9ae6d02146b27858a74f0619c6314b55fcf Mon Sep 17 00:00:00 2001
From: Andres Salomon <dilinger@collabora.co.uk>
Date: Tue, 17 Nov 2009 14:41:23 -0800
Subject: [PATCH] --- yaml --- r: 174482 b: refs/heads/master c:
 156822f7175d9ceb9d7e808502d3c5de8841e047 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/gpu/drm/drm_drv.c | 12 ++++++++++++
 trunk/include/drm/drmP.h        | 23 -----------------------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 644d89d0caa7..ca6af2680030 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 420a457088669e055e767dfb8468909cd1799cf9
+refs/heads/master: 156822f7175d9ceb9d7e808502d3c5de8841e047
diff --git a/trunk/drivers/gpu/drm/drm_drv.c b/trunk/drivers/gpu/drm/drm_drv.c
index a75ca63deea6..43297ca45f3e 100644
--- a/trunk/drivers/gpu/drm/drm_drv.c
+++ b/trunk/drivers/gpu/drm/drm_drv.c
@@ -365,6 +365,18 @@ static void __exit drm_core_exit(void)
 module_init(drm_core_init);
 module_exit(drm_core_exit);
 
+/**
+ * Copy and IOCTL return string to user space
+ */
+#define DRM_COPY(name, value)                                         \
+	len = strlen(value);                                          \
+	if (len > name##_len) len = name##_len;                       \
+	name##_len = strlen(value);                                   \
+	if (len && name) {                                            \
+		if (copy_to_user(name, value, len))                   \
+			return -EFAULT;                               \
+	}
+
 /**
  * Get version information
  *
diff --git a/trunk/include/drm/drmP.h b/trunk/include/drm/drmP.h
index 4977fa9038d9..1b72a526ba64 100644
--- a/trunk/include/drm/drmP.h
+++ b/trunk/include/drm/drmP.h
@@ -255,19 +255,8 @@ extern void drm_ut_debug_printk(unsigned int request_level,
 
 #define DRM_LEFTCOUNT(x) (((x)->rp + (x)->count - (x)->wp) % ((x)->count + 1))
 #define DRM_BUFCOUNT(x) ((x)->count - DRM_LEFTCOUNT(x))
-#define DRM_WAITCOUNT(dev,idx) DRM_BUFCOUNT(&dev->queuelist[idx]->waitlist)
 
 #define DRM_IF_VERSION(maj, min) (maj << 16 | min)
-/**
- * Get the private SAREA mapping.
- *
- * \param _dev DRM device.
- * \param _ctx context number.
- * \param _map output mapping.
- */
-#define DRM_GET_PRIV_SAREA(_dev, _ctx, _map) do {	\
-	(_map) = (_dev)->context_sareas[_ctx];		\
-} while(0)
 
 /**
  * Test that the hardware lock is held by the caller, returning otherwise.
@@ -286,18 +275,6 @@ do {										\
 	}									\
 } while (0)
 
-/**
- * Copy and IOCTL return string to user space
- */
-#define DRM_COPY( name, value )						\
-	len = strlen( value );						\
-	if ( len > name##_len ) len = name##_len;			\
-	name##_len = strlen( value );					\
-	if ( len && name ) {						\
-		if ( copy_to_user( name, value, len ) )			\
-			return -EFAULT;					\
-	}
-
 /**
  * Ioctl function type.
  *