From 65e7274008446d2059b7fd7cd6d7b1d6b04da0ce Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Sun, 27 Aug 2006 19:03:20 +0200
Subject: ttm create / destroy / ref / unref ioctl.

---
 linux-core/drm_bo.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'linux-core/drm_bo.c')

diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c
index 847b0406..35d4aba7 100644
--- a/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@ -338,13 +338,7 @@ int drm_bo_ioctl(DRM_IOCTL_ARGS)
 	(void) dev;
 
 	DRM_COPY_FROM_USER_IOCTL(arg, (void __user *)data, sizeof(arg));
-	data_ptr = arg.data_lo;
-
-	if (sizeof(data_ptr) > 4) {
-		int shift = 32;
-		data_ptr |= arg.data_hi << shift;
-	}
-
+	data_ptr = combine_64(arg.data_lo, arg.data_hi);
 	switch(arg.op) {
 	case drm_op_bo:
 		arg.num_requests = drm_do_bo_ioctl(priv, arg.num_requests, 
-- 
cgit v1.2.3