[patch] Patch to fix compile on kernel 2.6.36

psb-kernel-source-2.6.36.patch (text/plain), 3.35 KB, created by Jim Edwards on 2010-11-10 07:14:18 UTC

diff -r -u psb-kernel-source-4.41.1/drm_drv.c.old psb-kernel-source-4.41.1/drm_drv.c
--- psb-kernel-source-4.41.1/drm_drv.c.old
+++ psb-kernel-source-4.41.1/drm_drv.c
@@ -595,7 +595,7 @@
  * byte stack buffer to store the ioctl arguments in kernel space.  Should we
  * ever need much larger ioctl arguments, we may need to allocate memory.
  */
-int drm_ioctl(struct inode *inode, struct file *filp,
+long drm_ioctl(struct file *filp,
 	      unsigned int cmd, unsigned long arg)
 {
 	return psb_drm_unlocked_ioctl(filp, cmd, arg);
diff -r -u psb-kernel-source-4.41.1/drmP.h.old psb-kernel-source-4.41.1/drmP.h
--- psb-kernel-source-4.41.1/drmP.h.old
+++ psb-kernel-source-4.41.1/drmP.h
@@ -944,7 +944,7 @@
 			      struct pci_device_id *pciidlist);
 extern void drm_exit(struct drm_driver *driver);
 extern void drm_cleanup_pci(struct pci_dev *pdev);
-extern int drm_ioctl(struct inode *inode, struct file *filp,
+extern long drm_ioctl(struct file *filp,
 		     unsigned int cmd, unsigned long arg);
 extern long drm_unlocked_ioctl(struct file *filp,
 			       unsigned int cmd, unsigned long arg);
diff -r -u psb-kernel-source-4.41.1/i915_drv.c.old psb-kernel-source-4.41.1/i915_drv.c
--- psb-kernel-source-4.41.1/i915_drv.c.old
+++ psb-kernel-source-4.41.1/i915_drv.c
@@ -555,7 +555,7 @@
 		.owner = THIS_MODULE,
 		.open = drm_open,
 		.release = drm_release,
-		.ioctl = drm_ioctl,
+		.unlocked_ioctl = drm_ioctl,
 		.mmap = drm_mmap,
 		.poll = drm_poll,
 		.fasync = drm_fasync,
diff -r -u psb-kernel-source-4.41.1/i915_ioc32.c.old psb-kernel-source-4.41.1/i915_ioc32.c
--- psb-kernel-source-4.41.1/i915_ioc32.c.old
+++ psb-kernel-source-4.41.1/i915_ioc32.c
@@ -66,7 +66,7 @@
 			  &batchbuffer->cliprects))
 		return -EFAULT;
 
-	return drm_ioctl(file->f_dentry->d_inode, file,
+	return drm_ioctl(file,
 			 DRM_IOCTL_I915_BATCHBUFFER,
 			 (unsigned long) batchbuffer);
 }
@@ -102,7 +102,7 @@
 			  &cmdbuffer->cliprects))
 		return -EFAULT;
 
-	return drm_ioctl(file->f_dentry->d_inode, file,
+	return drm_ioctl(file,
 			 DRM_IOCTL_I915_CMDBUFFER, (unsigned long) cmdbuffer);
 }
 
@@ -125,7 +125,7 @@
 			  &request->irq_seq))
 		return -EFAULT;
 
-	return drm_ioctl(file->f_dentry->d_inode, file,
+	return drm_ioctl(file,
 			 DRM_IOCTL_I915_IRQ_EMIT, (unsigned long) request);
 }
 typedef struct drm_i915_getparam32 {
@@ -149,7 +149,7 @@
 			  &request->value))
 		return -EFAULT;
 
-	return drm_ioctl(file->f_dentry->d_inode, file,
+	return drm_ioctl(file,
 			 DRM_IOCTL_I915_GETPARAM, (unsigned long) request);
 }
 
@@ -178,7 +178,7 @@
 			  &request->region_offset))
 		return -EFAULT;
 
-	return drm_ioctl(file->f_dentry->d_inode, file,
+	return drm_ioctl(file,
 			 DRM_IOCTL_I915_ALLOC, (unsigned long) request);
 }
 
@@ -216,7 +216,7 @@
 	if (fn != NULL)
 		ret = (*fn)(filp, cmd, arg);
 	else
-		ret = drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
+		ret = drm_ioctl(filp, cmd, arg);
 	unlock_kernel();
 
 	return ret;
Nur in psb-kernel-source-4.42.0: install-stamp.
Nur in psb-kernel-source-4.42.0: patch-stamp.
diff -r -u psb-kernel-source-4.41.1/psb_drv.c.old psb-kernel-source-4.41.1/psb_drv.c
--- psb-kernel-source-4.41.1/psb_drv.c.old
+++ psb-kernel-source-4.41.1/psb_drv.c
@@ -985,7 +985,7 @@
 		 .owner = THIS_MODULE,
 		 .open = drm_open,
 		 .release = psb_release,
-		 .ioctl = drm_ioctl,
+		 .unlocked_ioctl = drm_ioctl,
 		 .mmap = drm_mmap,
 		 .poll = psb_poll,
 		 .fasync = drm_fasync,