rpms/kernel/devel kernel.spec, 1.263, 1.264 linux-2.6-drm-mm.patch, 1.2, 1.3

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7567

Modified Files:
	kernel.spec linux-2.6-drm-mm.patch 
Log Message:
* Thu Nov 29 2007 Dave Airlie <airlied at linux.ie>
- update drm-mm-git.patch to fix 64-bit truncation



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- kernel.spec	28 Nov 2007 23:53:33 -0000	1.263
+++ kernel.spec	29 Nov 2007 00:01:53 -0000	1.264
@@ -1726,6 +1726,9 @@
 
 %changelog
 * Thu Nov 29 2007 Dave Airlie <airlied at linux.ie>
+- update drm-mm-git.patch to fix 64-bit truncation
+
+* Thu Nov 29 2007 Dave Airlie <airlied at linux.ie>
 - update drm-mm-git.patch to enable sysfs udev device creation (#401961)
 
 * Wed Nov 28 2007 Kyle McMartin <kmcmartin at redhat.com>

linux-2.6-drm-mm.patch:

Index: linux-2.6-drm-mm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-drm-mm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-drm-mm.patch	28 Nov 2007 23:53:33 -0000	1.2
+++ linux-2.6-drm-mm.patch	29 Nov 2007 00:01:53 -0000	1.3
@@ -8145,7 +8145,7 @@
 +	DRM_MEMORYBARRIER();
 +}
 diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
-index e61a43e..b33de41 100644
+index e61a43e..9e5adca 100644
 --- a/drivers/char/drm/i915_dma.c
 +++ b/drivers/char/drm/i915_dma.c
 @@ -31,17 +31,6 @@
@@ -8753,7 +8753,7 @@
 +
 +		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;
 +		}
@@ -8804,7 +8804,7 @@
 +		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;