OSDN Git Service

Beside the emitted warning, the added cast (u64 -> unsigned) strips out
authorJiri Slaby <jirislaby@gmail.com>
Wed, 28 Nov 2007 23:55:38 +0000 (09:55 +1000)
committerDave Airlie <airlied@linux.ie>
Wed, 28 Nov 2007 23:55:38 +0000 (09:55 +1000)
part of address on 64 bit. Cast to unsigned long instead.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
shared-core/i915_dma.c

index c7d563f..f14b9b0 100644 (file)
@@ -918,7 +918,7 @@ int i915_validate_buffer_list(struct drm_file *file_priv,
 
                buffers[buf_count] = NULL;
 
-               if (copy_from_user(&arg, (void __user *)(unsigned)data, sizeof(arg))) {
+               if (copy_from_user(&arg, (void __user *)(unsigned long)data, sizeof(arg))) {
                        ret = -EFAULT;
                        goto out_err;
                }
@@ -969,7 +969,7 @@ int i915_validate_buffer_list(struct drm_file *file_priv,
                arg.handled = 1;
                arg.d.rep = rep;
 
-               if (copy_to_user((void __user *)(unsigned)data, &arg, sizeof(arg)))
+               if (copy_to_user((void __user *)(unsigned long)data, &arg, sizeof(arg)))
                        return -EFAULT;
 
                data = next;